From e8a60c1e518ddfeb5b5b913c3631b5daa56f6dad Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 17 Jan 2008 09:08:34 +0000 Subject: conf/machine: general machine config clean-up for Zaurus as discussed on oe-devel --- conf/machine/include/collie-2.6.inc | 33 ------------------------------- conf/machine/include/poodle-2.6.inc | 1 - conf/machine/include/zaurus-2.6.inc | 12 ++++------- conf/machine/include/zaurus-clamshell.inc | 3 +++ 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 conf/machine/include/collie-2.6.inc delete mode 100644 conf/machine/include/poodle-2.6.inc (limited to 'conf/machine/include') diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc deleted file mode 100644 index 8f8ccafeb1..0000000000 --- a/conf/machine/include/collie-2.6.inc +++ /dev/null @@ -1,33 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" - -SERIAL_CONSOLE = "115200 ttySA0" -MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi vfat" - -MACHINE_EXTRA_RDEPENDS = "kernel-modules" - -MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" - -zaurus_make_installkit () { - cd ${DEPLOY_DIR_IMAGE} - rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ - mkdir ${IMAGE_NAME}-installkit/ - # Get the latest kernel using the zImage-.bin symlink - cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage - if [ "${MACHINE}" = "spitz" ]; then - cp gnu-tar ${IMAGE_NAME}-installkit/ - cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz - else - [ -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 - - 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 - rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ -} - - diff --git a/conf/machine/include/poodle-2.6.inc b/conf/machine/include/poodle-2.6.inc deleted file mode 100644 index fa24a3281b..0000000000 --- a/conf/machine/include/poodle-2.6.inc +++ /dev/null @@ -1 +0,0 @@ -require conf/machine/include/zaurus-2.6.inc diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index eb020dbcba..a0a71a2969 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -1,8 +1,9 @@ -# Zaurus Clamshell specific configuration for kernel 2.6 -# Don't forget to include zaurus-clamshell.inc as well +# Zaurus specific configuration for kernel 2.6 +# Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +PACKAGE_EXTRA_ARCHS_collie = "" MACHINE_KERNEL_VERSION = "2.6" @@ -10,20 +11,15 @@ 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}" - EXTRA_IMAGEDEPENDS += "zaurus-updater" -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.inc - SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE_collie = "115200 ttySA0" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - PCMCIA_MANAGER ?= "pcmciautils" MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index f66502eff1..43c77d42da 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -1,3 +1,6 @@ +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/include/tune-xscale.inc + EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ -- cgit v1.2.3 From dc132e71345018da04eee8800b5404b6de322bc9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 18 Jan 2008 12:26:28 +0000 Subject: zaurus-clamshell.inc: removed OpenZaurus related note about feeds --- conf/machine/include/zaurus-clamshell.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index 43c77d42da..4fa9f75eb3 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -1,4 +1,3 @@ -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/include/tune-xscale.inc EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" -- cgit v1.2.3 From 0cbcbf9ad2bff7f76607eebf09b85da56df7c7d3 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 18 Jan 2008 15:56:25 +0000 Subject: zaurus-2.6: added kernel size for do_sizecheck --- conf/machine/include/zaurus-2.6.inc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'conf/machine/include') diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index a0a71a2969..2037931803 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -37,6 +37,9 @@ 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" zaurus_make_installkit () { -- cgit v1.2.3