Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/21 20:48:43+00:00 nexus.co.uk!pb
remove simpad_flashimg bits, not required with "new" bootloader

BKrev: 41a0ff44HwrkQEiowoGyFGgPeZqMyg

diff --git a/classes/simpad_flashimg.oeclass b/classes/simpad_flashimg.oeclass
deleted file mode 100644 (file)
index a3aff2e..0000000
--- a/classes/simpad_flashimg.oeclass
+++ /dev/null
@@ -1,9 +0,0 @@
-EXTRA_IMAGEDEPENDS += 'virtual/kernel genboot-native'
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \
-                  ${EXTRA_IMAGECMD}; \
-                  cd ${DEPLOY_DIR_IMAGE}; \
-                  simpad-make-flashimg complete ${STAGING_KERNEL_DIR}/zImage ${T}/${IMAGE_NAME}.rootfs.jffs2; \
-                  mv zImage.initrd.flashfile ${IMAGE_NAME}.img"
-IMAGE_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/zImage*; "
-

diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 2e2a7a8..f9c7c87 100644 (file)
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -16,9 +16,8 @@ kernel-module-pcnet-cs kernel-module-8390"
 BOOTSTRAP_EXTRA_DEPENDS  += "e2fsprogs"
 BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
 
-EXTRA_IMAGECMD_jffs2 = "--pad=0xe80000 --little-endian --eraseblock=0x20000 -n"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
 EXTRA_IMAGEDEPENDS = ""
-INHERIT += "simpad_flashimg"
 SERIAL_CONSOLE = "ttySA0 38400 vt100"
 
 USE_DEVFS = "1"