diff options
Diffstat (limited to 'conf/machine/include/zaurus-2.6.inc')
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 96 |
1 files changed, 46 insertions, 50 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index aeba16b67c..02a48629c8 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -1,73 +1,69 @@ -# Zaurus specific configuration for kernel 2.6 +# Zaurus common settings # Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" -MACHINE_KERNEL_VERSION = "2.6" - ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" +# Warning! SL-C3000 seems to be "0x4000" (16m NAND) +# C3100 and C3200 have same 128MB NAND device as akita +ERASEBLOCKSIZE_spitz = "0x20000" + EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -ZAURUS-UPDATER = "zaurus-updater" -EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}" +EXTRA_IMAGEDEPENDS += "zaurus-installer" SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE_collie = "115200 ttySA0" + +# FIXME: xserver-xorg is in testing -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +# deprecated defaults PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +# c7x0 uses kdrive-imageon (W100) PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" +XSERVER_c7x0 = "xserver-kdrive-imageon" + +# collie uses kdrive-fbdev +PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev" +XSERVER_collie = "xserver-kdrive-fbdev" + +# FIXME xserver-kdrive 1.3.0.0 is still the only working version ? +PREFERRED_PROVIDER_virtual/xserver_akita = "xserver-kdrive-1300" +XSERVER_akita = "xserver-kdrive-1300-fbdev" + +# spitz uses xserver-xorg +PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg" +XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev" +PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri" PCMCIA_MANAGER ?= "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" -MACHINE_FEATURES_append_tosa = " usbhost wifi " +IMAGE_FSTYPES += "jffs2 tar.gz" + +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" MACHINE_FEATURES_append_akita = " usbhost " -MACHINE_FEATURES_append_spitz = " usbhost ext2 " +MACHINE_FEATURES_append_spitz = " usbhost " +MACHINE_FEATURES_append_tosa = " usbhost wifi " + +MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" +MACHINE_EXTRA_RDEPENDS_collie = "zaurusd" -MACHINE_EXTRA_RDEPENDS = "zaurusd" +# Here we just need snd modules +# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel +# Fixme ? module-snd for collie +MACHINE_EXTRA_RRECOMMENDS_collie = "" MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" 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_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" +# For tosa: OHCI suspend/resume fixup +# wlan-ng is now in kernel (2.6.29) +# Fixme ? module-snd for tosa +MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" -GUI_MACHINE_CLASS = "bigscreen" -GUI_MACHINE_CLASS_poodle = "smallscreen" - -KERNEL_IMAGE_MAXSIZE = "1294336" - -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-<machine>.bin symlink - if [ "${@base_contains('MACHINE_FEATURES', 'kexecboot', 'true', 'false',d)}" = "true" ]; then - [ -f "zImage-kexecboot-${MACHINE}.bin" ] && cp zImage-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage - # we need also tgz for mmc or cf cards - cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/image.tgz - else - cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage - fi - - 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 - - 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 - rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ -} - -KERNEL_IMAGETYPE ?= "zImage" - -require conf/machine/include/kexecboot.inc +require conf/machine/include/zaurus-kernel.inc +require conf/machine/include/initramfs-kexecboot.inc |