diff options
| author | Rod Whitby <rod@whitby.id.au> | 2009-02-09 04:38:31 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2009-02-09 04:38:31 +0000 |
| commit | 121f43bd68c80c1c15d1d9ec5cfe83ffb33e3fbb (patch) | |
| tree | 1fb7c8ad4ad5fe8e69b0a1e2749cbde9868d4607 /conf/machine/include | |
| parent | 66192bbdaab409dff4b6f812dbd5c07cd943cdac (diff) | |
| parent | 7f4149db1ab21d402bd448431a57e31dddfc578d (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/kexecboot.inc | 1 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 15 |
2 files changed, 3 insertions, 13 deletions
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc index 0a9f209fe2..c8656bb117 100644 --- a/conf/machine/include/kexecboot.inc +++ b/conf/machine/include/kexecboot.inc @@ -13,3 +13,4 @@ RDEPENDS_kernel-base = "kernel-image" # we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels DONT_CHECK_KERNELSIZE ?= "1" +MACHINE_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 8fb36f78be..aeba16b67c 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -2,7 +2,6 @@ # Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS_collie = "" MACHINE_KERNEL_VERSION = "2.6" @@ -10,14 +9,11 @@ ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" -ZAURUS-UPDATER_collie = "" ZAURUS-UPDATER = "zaurus-updater" EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}" SERIAL_CONSOLE = "115200 ttyS0" -SERIAL_CONSOLE_collie = "115200 ttySA0" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" @@ -35,16 +31,11 @@ MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-px MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" -MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \ - kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi \ - kernel-module-power" GUI_MACHINE_CLASS = "bigscreen" -GUI_MACHINE_CLASS_collie = "smallscreen" GUI_MACHINE_CLASS_poodle = "smallscreen" KERNEL_IMAGE_MAXSIZE = "1294336" -KERNEL_IMAGE_MAXSIZE_collie = "1048576" MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" @@ -69,10 +60,8 @@ zaurus_make_installkit () { [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin fi - # All zaurus machines except collie need updater.sh - if [ "${MACHINE}" != "collie" ]; then - cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh - fi + cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh + tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/ md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5 |