Zaurus: don't package kernel things into the root file system

BKrev: 409a73804Ev_RG3hvObPl18o7Su3Ng

diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
index 48e384b..c90d559 100644 (file)
--- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
+++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
@@ -42,6 +42,12 @@ S = "${WORKDIR}/linux"
 
 inherit kernel
 
+#
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+FILES_kernel = ""
+ALLOW_EMPTY = 1
+
 EXTRA_OEMAKE = ""
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"

diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
index 6803e1d..0ae13b6 100644 (file)
--- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -31,14 +31,23 @@ S = "${WORKDIR}/linux"
 
 inherit kernel
 
-#FIXME: Use configuration system
-export MEM = "32"
-export RD = "32"
-export CMDLINE = "console=ttySA root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphand_inodes=delete"
-EXTRA_OEMAKE = ""
+#
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+FILES_kernel = ""
+ALLOW_EMPTY = 1
+
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
+EXTRA_OEMAKE = ""
+
+#
+# FIXME: Use configuration system
+#
+export MEM = "32"
+export RD = "32"
+export CMDLINE = "console=ttySA root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphand_inodes=delete"
 
 do_configure_prepend() {
         install -m 0644 ${FILESDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."

diff --git a/mtd/mtd-native.oe b/mtd/mtd-native.oe
index 2fbdc49..ed32e7e 100644 (file)
--- a/mtd/mtd-native.oe
+++ b/mtd/mtd-native.oe
@@ -4,9 +4,9 @@ DEPENDS = "patcher-native zlib-native"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/mtd"
 
 do_stage () {
-       for binary in ftl_format erase eraseall nanddump doc_loadbios \
-               mkfs.jffs ftl_check mkfs.jffs2 lock unlock einfo mtd_debug \
-               fcp nandwrite jffs2dump; do
+       for binary in ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
+               mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
+               flashcp nandwrite jffs2dump; do
                install -m 0755 util/$binary ${STAGING_BINDIR}/
        done
 }

diff --git a/mtd/mtd.oe b/mtd/mtd.oe
index c6a11b5..6ded9d3 100644 (file)
--- a/mtd/mtd.oe
+++ b/mtd/mtd.oe
@@ -15,9 +15,9 @@ do_compile () {
 
 do_install () {
        install -d ${D}${bindir}
-       for binary in ftl_format erase eraseall nanddump doc_loadbios \
-               mkfs.jffs ftl_check mkfs.jffs2 lock unlock einfo mtd_debug \
-               fcp nandwrite jffs2dump; do
+       for binary in ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
+               mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
+               flashcp nandwrite jffs2dump; do
                install -m 0755 util/$binary ${D}${bindir}
        done
 }