diff options
Diffstat (limited to 'conf/machine')
43 files changed, 124 insertions, 119 deletions
diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf index 0dda9492e9..b119a24359 100644 --- a/conf/machine/aximx50.conf +++ b/conf/machine/aximx50.conf @@ -32,10 +32,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-utf8 \ - kernel-module-af-key \ +MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-i2c-pxa" # diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf index 2522897042..1b6188753e 100644 --- a/conf/machine/cm-x270.conf +++ b/conf/machine/cm-x270.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS ?= "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_linux = "2.6.23" +PREFERRED_VERSION_linux ?= "2.6.23" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 09517fd11d..68bf1b9025 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" @@ -47,3 +47,7 @@ EXTRA_IMAGEDEPENDS += "dfu-util-native" # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc + +# set partition to flash kernel into +MTD_KERNEL_PARTITION = "/dev/mtd2" + diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index 4cad7924f1..25c3878ee3 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" @@ -49,3 +49,7 @@ include conf/machine/include/tune-arm920t.inc # build YAFFS2 IMAGE_FSTYPES ?= "jffs2 yaffs2" + +# set partition to flash kernel into +MTD_KERNEL_PARTITION = "/dev/mtd2" + diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 15390d2d56..439c484970 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -15,7 +15,7 @@ ROOT_FLASH_SIZE = "16" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 409eacaed5..99e82d28f4 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -13,7 +13,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen vfat" # Some extra configuration diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 60a732ffa6..cad7d0393c 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -17,7 +17,7 @@ ROOT_FLASH_SIZE = "32" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen vfat" # # Software/packages selection @@ -26,13 +26,21 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " h2200-bootloader " +MACHINE_EXTRA_RDEPENDS = " udev-hostap-cs-vcc-workaround " +MACHINE_EXTRA_RRECOMMENDS = "\ + kernel-module-snd-h2200-audio \ + kernel-module-i2c-pxa \ + " + EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" # # Modules autoload and other boot properties # module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_snd-h2200-audio = "snd-h2200-audio" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 9cf8272b51..c037226154 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -17,7 +17,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" # # Software/packages selection @@ -27,32 +27,11 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ +MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-micro" EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" - - -# TODO: see if any of these modules have 2.6 counterparts -# and need to be RRECOMMENDED -# -#H3600_MODULES = "\ -#h3600-asic \ -#hwtimer \ -#nvrd \ -#sa1100-cs \ -#sa1100-ir \ -#sa1100-wdt \ -#sa1100-audio \ -#sa1100-rtc \ -#sa1100usb-core \ -#sd-mod \ -#serial-h3800 \ -#" - - - # # Modules autoload and other boot properties # diff --git a/conf/machine/h3800.conf b/conf/machine/h3800.conf index 173f2a5c8f..a13ed48d4a 100644 --- a/conf/machine/h3800.conf +++ b/conf/machine/h3800.conf @@ -3,6 +3,6 @@ #@DESCRIPTION: Machine configuration for the Compaq iPAQ 38xx devices #this machine will be primarily focussed on the 2.6 port -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen vfat" require conf/machine/h3600.conf diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index f475e20c46..5db7abd3d4 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index f56bee00e8..03dccedccc 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection @@ -26,8 +26,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ - kernel-module-h4000-pcmcia \ kernel-module-i2c-pxa \ + kernel-module-h4000-bt \ + kernel-module-h4000-pcmcia \ kernel-module-acx \ " @@ -36,7 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ # module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_snd-h4000_audio = "snd-h4000_audio" +module_autoload_snd-h4000-audio = "snd-h4000-audio" module_autoload_g_ether = "g_ether" module_conf_acx = "blacklist acx" diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index 6ed836c1de..fcd6cfa0b9 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te h5xxx" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" require conf/machine/include/tune-xscale.inc @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen vfat" # # Software/packages selection @@ -31,5 +31,9 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ # # Modules autoload and other boot properties # +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_g_ether = "g_ether" + SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 711ffd314c..65a82d1e0b 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -15,7 +15,7 @@ require conf/machine/include/tune-arm9tdmi.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf index 63ab097a89..6bf89999bf 100644 --- a/conf/machine/htcalpine.conf +++ b/conf/machine/htcalpine.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf index 1b44742874..afaa6fc294 100644 --- a/conf/machine/htcapache.conf +++ b/conf/machine/htcapache.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index 44454f3902..a5feeb2d69 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "128" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf index 8430cb57d4..003406bd88 100644 --- a/conf/machine/htchimalaya.conf +++ b/conf/machine/htchimalaya.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf index f9326475e6..a577cc78d2 100644 --- a/conf/machine/htcsable.conf +++ b/conf/machine/htcsable.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "240" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf index af91bcbb9f..016247213d 100644 --- a/conf/machine/htctornado.conf +++ b/conf/machine/htctornado.conf @@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux-tornado-omap2" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat" MACHINE_EXTRA_RDEPENDS = "alsa-state" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index c3e7cf710e..55a6757e7c 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.inc MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone" +MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone vfat" MACHINE_FEATURES += "iwmmxt" # @@ -28,11 +28,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" XSERVER = "xserver-kdrive-fbdev" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-utf8 \ - kernel-module-af-key \ - kernel-module-bsd-comp \ +MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-i2c-pxa \ kernel-module-snd-htcuniversal-audio \ kernel-module-htcuniversal-acx \ diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf index 38b0c011be..34255a1536 100644 --- a/conf/machine/htcwallaby.conf +++ b/conf/machine/htcwallaby.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "32" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone vfat" # # Software/packages selection diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index c0d9016407..84733217d1 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -19,7 +19,7 @@ IMAGE_FSTYPES ?= "jffs2 tar.bz2" MODUTILS = "26" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen vfat" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 87e03a7bdd..0d3a9bbcf0 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -1,5 +1,5 @@ #@TYPE: Machine -#@NAME: iPAQ hx47xx +#@NAME: HP iPAQ hx47xx #@DESCRIPTION: Machine configuration for the hx4700 iPAQ with a pxa27x CPU # @@ -19,7 +19,9 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "200" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 pcmcia screen touchscreen usbgadget wifi vfat" MACHINE_FEATURES += "iwmmxt" # @@ -34,17 +36,14 @@ XSERVER = "xserver-kdrive-w100" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-utf8 \ - kernel-module-af-key \ - kernel-module-i2c-pxa \ - kernel-module-pxa27x-voltage \ - kernel-module-pxa27x-voltage-max158xx \ - kernel-module-acx \ - kernel-module-hx4700-acx \ - kernel-module-hx4700-bt \ - kernel-module-snd-hx4700-audio" +MACHINE_EXTRA_RRECOMMENDS = "\ + kernel-module-i2c-pxa \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ + kernel-module-acx \ + kernel-module-hx4700-acx \ + kernel-module-hx4700-bt \ + kernel-module-snd-hx4700-audio" #write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc index f22ffce6c2..bc80185fa0 100644 --- a/conf/machine/include/collie-2.6.inc +++ b/conf/machine/include/collie-2.6.inc @@ -1,6 +1,33 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp" SERIAL_CONSOLE = "115200 ttySA0" -MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi" +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-<machine>.bin symlink + cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin + 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/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index 04b6542470..bdf00d15c9 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -2,20 +2,24 @@ #@NAME: ixp4xx #@DESCRIPTION: genric machine configuration for ixp4xx platforms -# Set default for nslu2 - can be overridden for machines with other features. -MACHINE_FEATURES ?= "kernel26 usbhost ext2" +# Set default for common ixp4xx-based machines +MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex" -# Set defaults for nslu2 - can be overridden for machines with other requirements. -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +# Select an appropriate default kernel +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.7+svnr${SRCREV}" + +# Add packages required for basic networking support +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" -# Set default for nslu2 - can be overridden for machines with more flash. +# Set default for 16MB machines - can be overridden for more or less flash. ROOT_FLASH_SIZE ?= "12" -# Set default for nslu2, nas100d, dsmg600 -EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" +# Allow for rootfs loaded direct from internal hard disk +IMAGE_FSTYPES ?= "jffs2 tar.gz" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" +# Set default for common ixp4xx-based machines +EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" require conf/machine/include/tune-xscale.inc require conf/machine/include/tune-thumb.inc diff --git a/conf/machine/include/palm.inc b/conf/machine/include/palm.inc index 5eb7806f6f..22c6ad4233 100644 --- a/conf/machine/include/palm.inc +++ b/conf/machine/include/palm.inc @@ -10,7 +10,7 @@ SERIAL_CONSOLE = "115200 ttyS0" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.inc -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2 vfat" # # Software/packages selection diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 7e41da0783..3f84138ac8 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -26,7 +26,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PCMCIA_MANAGER ?= "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " MACHINE_FEATURES_append_spitz = " usbhost ext2 " diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf deleted file mode 100644 index 0a1e54c324..0000000000 --- a/conf/machine/ixp4xx.conf +++ /dev/null @@ -1,5 +0,0 @@ -#@TYPE: Machine -#@NAME: Generic IXP4XX kernel -#@DESCRIPTION: Machine configuration for a generic ixp4xx board - -MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to ixp4xxle or ixp4xxbe.')} diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index a322f1a60c..3735bc0312 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -9,4 +9,4 @@ require conf/machine/include/tune-sh3.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx" PCMCIA_MANAGER = "pcmciautils" -MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen vfat" diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index 461d0c8326..8741eb4ff6 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -8,5 +8,5 @@ require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen vfat" MACHINE_EXTRA_RDEPENDS = "kernel-modules" diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf index f4fd23eec9..1792cda280 100644 --- a/conf/machine/looxc550.conf +++ b/conf/machine/looxc550.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 900b24b751..1c1d08afb1 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -21,15 +21,9 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "142" -MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost vfat" MACHINE_FEATURES += "iwmmxt" - -# -# We don't support jffs2 installations (yet). -# -IMAGE_FSTYPES = "tar.bz2" - # # Software/packages selection # @@ -41,20 +35,20 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RRECOMMENDS = " \ - kernel-module-af-key \ kernel-module-i2c-pxa \ kernel-module-pxa27x-voltage \ kernel-module-pxa27x-voltage-max158xx \ - kernel-module-leds-magician \ kernel-module-magician-ts \ - kernel-module-magician-flash \ - kernel-module-magician-ds1wm \ - kernel-module-magician-battery \ kernel-module-magician-phone \ kernel-module-magician-pm \ kernel-module-n-tihtc \ kernel-module-snd-soc-magician" +#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there +EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 256KiB -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" + # # Modules autoload and other boot properties @@ -64,8 +58,6 @@ module_autoload_leds-magician = "leds-magician" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_pxa27x_udc = "pxa27x_udc" -module_autoload_magician_ds1wm = "magician_ds1wm" -module_autoload_magician-battery = "magician-battery" module_autoload_magician_phone = "magician_phone" module_autoload_magician_pm = "magician_pm" module_autoload_n_tihtc = "n_tihtc" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index a6681a9030..af3e5a5cc3 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -15,6 +15,7 @@ require conf/machine/include/tune-xscale.inc SERIAL_CONSOLE = "115200 ttyS0" # used by opie-collections.inc -ROOT_FLASH_SIZE = "32" +ROOT_FLASH_SIZE = "16" MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e 0x40000 --pad=0x01000000" diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index 3c47b53b56..81c3e29e91 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -13,6 +13,9 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" PREFERRED_VERSION_u-boot = "1.3.0" UBOOT_MACHINE = "MPC8313ERDB_33_config" +#rootfs on NAND flash +EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers" + #don't try to access tty1 USE_VT = "0" diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index 1c9fc7af9d..330a1287e4 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -15,7 +15,7 @@ USE_VT = "0" #use the epson xserver XSERVER = "xserver-kdrive-epson" -MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost screen" +MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost screen vfat" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0 vt100" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 0e308b0a67..45fc16dc29 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -30,7 +30,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" #use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen vfat" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" # build tools diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index 703fc1984d..58ddb25744 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" #use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost vfat" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" # build tools diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf deleted file mode 100644 index 7e45825f69..0000000000 --- a/conf/machine/nslu2.conf +++ /dev/null @@ -1,5 +0,0 @@ -#@TYPE: Machine -#@NAME: Linksys NSLU2 -#@DESCRIPTION: Machine configuration for the Linksys NSLU2 product - -MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to nslu2le or nslu2be.')} diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 3162eb3342..360e397e04 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -6,8 +6,6 @@ TARGET_ARCH = "armeb" PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe" -MACHINE_ARCH = "ixp4xxbe" - OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ROOT_FLASH_SIZE ?= "6" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index 1aced19de2..1ad9bdd96a 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -6,8 +6,6 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle" -MACHINE_ARCH = "ixp4xxle" - OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ROOT_FLASH_SIZE ?= "6" diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf index ba2c956d87..f8ca7ec033 100644 --- a/conf/machine/rx1950.conf +++ b/conf/machine/rx1950.conf @@ -16,7 +16,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat # # Software/packages selection diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf index 4b3acc0a85..2531f984f0 100644 --- a/conf/machine/rx3000.conf +++ b/conf/machine/rx3000.conf @@ -16,7 +16,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index ab3da912ba..6334d34171 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -6,7 +6,7 @@ MACHINE_KERNEL_VERSION ?= "2.6" TARGET_ARCH = "arm" -MACHINE_FEATURES = " apm pcmcia irda screen touchscreen " +MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat" include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc require conf/machine/include/tune-strongarm.inc |