diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2011-02-18 15:17:21 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-21 17:59:39 +0000 |
| commit | 7bae9465f3594bffcfdfe19b58c1d4f4e3349704 (patch) | |
| tree | 5365c5e0f79be3379250903aca98cdb9907b9120 /meta | |
| parent | 7537f44a498860c08f613544e5f40fe2f24adaa8 (diff) | |
| download | poky-7bae9465f3594bffcfdfe19b58c1d4f4e3349704.tar.gz | |
zaurus: remove zaurus linux includes
Zaurus support was removed with:
673abd92f999829bdd67d0273c43570a62123a63
conf/machine: Drop older machines with no recent updates
which removed both the linux-rp and sharp-flash-header recipes required by the
zaurus includes removed by this patch.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/machine/include/zaurus-2.6.inc | 72 | ||||
| -rw-r--r-- | meta/conf/machine/include/zaurus-clamshell.inc | 15 |
2 files changed, 0 insertions, 87 deletions
diff --git a/meta/conf/machine/include/zaurus-2.6.inc b/meta/conf/machine/include/zaurus-2.6.inc deleted file mode 100644 index aec61c7cfb..0000000000 --- a/meta/conf/machine/include/zaurus-2.6.inc +++ /dev/null | |||
| @@ -1,72 +0,0 @@ | |||
| 1 | # Zaurus specific configuration for kernel 2.6 | ||
| 2 | # Additionally, clamshell specific stuff in zaurus-clamshell.inc | ||
| 3 | |||
| 4 | TARGET_ARCH = "arm" | ||
| 5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" | ||
| 6 | PACKAGE_EXTRA_ARCHS_collie = "" | ||
| 7 | |||
| 8 | MACHINE_KERNEL_VERSION = "2.6" | ||
| 9 | |||
| 10 | ERASEBLOCKSIZE = "0x4000" | ||
| 11 | ERASEBLOCKSIZE_akita = "0x20000" | ||
| 12 | |||
| 13 | EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" | ||
| 14 | IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" | ||
| 15 | EXTRA_IMAGEDEPENDS += "zaurus-updater" | ||
| 16 | |||
| 17 | SERIAL_CONSOLE = "115200 ttyS0" | ||
| 18 | SERIAL_CONSOLE_collie = "115200 ttySA0" | ||
| 19 | |||
| 20 | PREFERRED_PROVIDER_virtual/kernel = "linux-rp" | ||
| 21 | PREFERRED_PROVIDER_xserver = "xserver-kdrive" | ||
| 22 | |||
| 23 | PCMCIA_MANAGER ?= "pcmciautils" | ||
| 24 | |||
| 25 | MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" | ||
| 26 | MACHINE_FEATURES_append_tosa = " usbhost wifi " | ||
| 27 | MACHINE_FEATURES_append_akita = " usbhost " | ||
| 28 | MACHINE_FEATURES_append_spitz = " usbhost ext2 " | ||
| 29 | |||
| 30 | MACHINE_EXTRA_RDEPENDS = "zaurusd" | ||
| 31 | MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" | ||
| 32 | MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" | ||
| 33 | MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" | ||
| 34 | MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" | ||
| 35 | |||
| 36 | GUI_MACHINE_CLASS = "bigscreen" | ||
| 37 | GUI_MACHINE_CLASS_collie = "smallscreen" | ||
| 38 | GUI_MACHINE_CLASS_poodle = "smallscreen" | ||
| 39 | |||
| 40 | KERNEL_IMAGE_MAXSIZE = "1294336" | ||
| 41 | KERNEL_IMAGE_MAXSIZE_collie = "1048576" | ||
| 42 | |||
| 43 | MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" | ||
| 44 | |||
| 45 | zaurus_make_installkit () { | ||
| 46 | cd ${DEPLOY_DIR_IMAGE} | ||
| 47 | rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ | ||
| 48 | mkdir ${IMAGE_NAME}-installkit/ | ||
| 49 | |||
| 50 | # Get the latest kernel using the zImage-<machine>.bin symlink | ||
| 51 | cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage | ||
| 52 | |||
| 53 | if [ "${MACHINE}" = "spitz" ]; then | ||
| 54 | cp gnu-tar ${IMAGE_NAME}-installkit/ | ||
| 55 | cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz | ||
| 56 | else | ||
| 57 | [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin | ||
| 58 | fi | ||
| 59 | |||
| 60 | # All zaurus machines except collie need updater.sh | ||
| 61 | if [ "${MACHINE}" != "collie" ]; then | ||
| 62 | cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh | ||
| 63 | fi | ||
| 64 | |||
| 65 | tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/ | ||
| 66 | md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5 | ||
| 67 | rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ | ||
| 68 | } | ||
| 69 | |||
| 70 | # Don't include kernels in standard images for Zaurus machines | ||
| 71 | RDEPENDS_kernel-base = "" | ||
| 72 | KERNEL_IMAGETYPE = "zImage" | ||
diff --git a/meta/conf/machine/include/zaurus-clamshell.inc b/meta/conf/machine/include/zaurus-clamshell.inc deleted file mode 100644 index 4fa9f75eb3..0000000000 --- a/meta/conf/machine/include/zaurus-clamshell.inc +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | include conf/machine/include/tune-xscale.inc | ||
| 2 | |||
| 3 | EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" | ||
| 4 | |||
| 5 | IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ | ||
| 6 | --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ | ||
| 7 | && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ | ||
| 8 | -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ | ||
| 9 | --eraseblock=${ERASEBLOCKSIZE} -l -p; \ | ||
| 10 | cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ | ||
| 11 | ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ | ||
| 12 | rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ | ||
| 13 | cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ | ||
| 14 | ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ | ||
| 15 | rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" | ||
