conf/machine: sync with .dev

26 files changed, 138 insertions, 200 deletions

diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index 3977f50e2b..6b6e5a8ea9 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -1,11 +1,11 @@
 #@TYPE: Machine
-#@NAME: Motorola EZX A780
-#@DESCRIPTION: Machine configuration for the Motorola GSM phone A780
+#@NAME: Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
+#@DESCRIPTION: Machine configuration for the Motorola GSM phones A780, E680, and E680i
 
-include conf/machine/include/motorola-ezx.conf
+require conf/machine/include/motorola-ezx.conf
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
@@ -18,9 +18,11 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 #mtd2: 00580000 00020000 "VFM_Filesystem"
 #mtd3: 00020000 00020000 "Logo"
 
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard"
+
 ROOT_FLASH_SIZE = "24"
 
-# EXTRA_IMAGEDEPENDS += "ezx-updater"
+EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf
index dbe74dea45..443b70c5de 100644
--- a/conf/machine/amsdelta.conf
+++ b/conf/machine/amsdelta.conf
@@ -5,7 +5,6 @@
 TARGET_ARCH = "arm"
 
 TARGET_FPU = "soft"
-IPKG_ARCHS = "all arm ${MACHINE}"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-amsdelta-2.6"
@@ -24,4 +23,6 @@ PREFERRED_VERSION_u-boot = 1.1.4
 
 TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
 
+IMAGE_ROOTFS_SIZE_ext2 = "8192"
+IMAGE_ROOTFS_SIZE_ext2.gz = "8192"
 IMAGE_FSTYPES = "ext2.gz tar.bz2"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 0bd9623526..893378f569 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -3,7 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-2.6.conf
+
+IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "25"
 # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index 40387b53a9..2faf6ebed9 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -2,10 +2,9 @@
 #@Name: Genisi EFIKA Development Platform
 #@DESCRIPTION: Machine configuration for teh EFIKA development platform: http://www.pegasosppc.com/efika.php
 
-INHERIT += "linux_modules"
 
 TARGET_ARCH = "powerpc"
-IPKG_ARCHS = "all ppc ${MACHINE}"
+IPKG_EXTRA_ARCHS = "ppc"
 
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index b1e620882d..955344344a 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -2,10 +2,9 @@
 #@Name: Cirrus Logic EP-93xx Development Platform
 #@DESCRIPTION: Machine configuration for Cirrus Logic EP-93xx Development Platform
 
-INHERIT += "linux_modules"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4t ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
@@ -15,10 +14,11 @@ USE_VT = "0"
 
 
 #ship in rootfs:
-EP93XX_MODULES = "apm \
-                  pcmcia-core \
-                  ipv6 "
-BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${EP93XX_MODULES}', d)}"
+EP93XX_MODULES = "kernel-module-apm \
+                  kernel-module-pcmcia-core \
+                  kernel-module-ipv6 "
+
+BOOTSTRAP_EXTRA_RRECOMMENDS += "${EP93XX_MODULES}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
 
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 0fc8a1ef95..65f27085f4 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -4,7 +4,7 @@
 
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
@@ -14,7 +14,11 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 ROOT_FLASH_SIZE = "32"
 PCMCIA_MANAGER = "pcmciautils"
 
-BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget"
+
+
+BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${H2200_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools"
 
 #ship in rootfs:
@@ -23,7 +27,7 @@ H2200_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss"
 #autoload on boot:
 module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
 
-SERIAL_CONSOLE = "115200 tts/0 vt100"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 
 USE_VT = "0"
 
@@ -32,3 +36,6 @@ include conf/machine/include/handheld-common.conf
 GUI_MACHINE_CLASS = "smallscreen"
 
 include conf/machine/include/tune-xscale.conf
+
+# LAB can only resolve relative symlinks
+ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index cab50dbdf6..65cce6ce81 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -1,14 +1,16 @@
 #@TYPE: Machine
-#@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
-#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
+#@NAME: Compaq iPAQ 39xx
+#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx
 
 KERNEL ?= "kernel24"
 #KERNEL ?= "kernel26"
 
+INHERIT += "linux_modules"
+
 OVERRIDES =. "${KERNEL}:"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h3900"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
 PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
@@ -17,11 +19,10 @@ EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
 ROOT_FLASH_SIZE = "32"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
 BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
 
-H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380"
-H3900_MODULES_kernel26 = " h3900_lcd h5400_lcd asic2_adcts g_ether apm h5400_battery h3900_battery pcmcia-core"
+H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic nmc_asic3 mtdchar h3900-uda1380"
+H3900_MODULES_kernel26 = " h3900_lcd asic2_adcts g_ether apm h3900_battery pcmcia-core"
 # pxa2xx_udc is built in to the kernel
 
 SERIAL_CONSOLE = "115200 tts/0 vt100"
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
index f8767d2ddf..9ac43d84e9 100644
--- a/conf/machine/include/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
@@ -18,6 +18,6 @@ input uinput \
 
 # Configuration bits for "generic handheld"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils  wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
 INHERIT += "linux_modules"
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 639bf4a74e..93befb92ce 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -62,7 +62,7 @@ IXP4XX_SUFFIX = "${MACHINE_ARCH}"
 #    arm/thumb interworking are enabled in the inputs.
 OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
 OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
-OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}"
+OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}:fail-fast"
 
 # TARGET_CC_ARCH
 # TARGET_CC_KERNEL_ARCH
@@ -111,7 +111,7 @@ TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}"
 #    because everything built here is no more specific than that.
 MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}"
 
-# IPKG_ARCHS
+# IPKG_EXTRA_ARCHS
 #    The full list of package architectures which should run on the system.
 #    This takes into account both the board level issues and the INPUTS set
 #    by the distro.  The arm list is derived from the architecture settings
@@ -126,12 +126,12 @@ THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t$
 #    NOTE: this list contains just the things which rootfs_ipk.bbclass does
 #    not add, rootfs_ipk.bbclass evaluates:
 #
-#        ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+#        ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
 #
 #    This is a priority ordered list - most desireable architecture at the end,
 #    so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if
 #    THUMB_INTERWORK precede this with the other architectures.
-IPKG_ARCHS = "ixp4xx ${MACHINE} \
+IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
 		${@(lambda arch_thumb, arch_arm, is_arm, interwork: \
 		(interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \
 		+ '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \
@@ -146,7 +146,7 @@ IPKG_ARCHS = "ixp4xx ${MACHINE} \
 #    the removal of the raw "${MACHINE}" from the end of the list.  ${MACHINE} and
 #    ixp4xx are included at the start (lower priority) as the non-byte-sex specific
 #    versions.
-IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_ARCHS}"
+IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}"
 
 #-------------------------------------------------------------------------------
 # Package versions
diff --git a/conf/machine/include/motorola-ezx.conf b/conf/machine/include/motorola-ezx.conf
index cde37556ce..e87f6aa70f 100644
--- a/conf/machine/include/motorola-ezx.conf
+++ b/conf/machine/include/motorola-ezx.conf
@@ -1,10 +1,11 @@
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+# choose the proper kernel for this hardware
+PREFERRED_PROVIDER_virtual/kernel = "ezx-kernels"
+# we don't need support for kernel 2.4
+MODUTILS = "26"
+# build tar.gz for SD/MMC/Transflash and jffs2 for later when we have mtd
+IMAGE_FSTYPES = "tar.gz jffs2"
 
-IMAGE_FSTYPES = "ext2.gz jffs2"
-
-PREFERRED_VERSION_wpa_supplicant = "0.4.7"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw apm irda-utils udev-utils ppp ppp-dialin module-init-tools "
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils apm irda-utils udev-utils ppp ppp-dialin module-init-tools"
 
 #
 # disable all modules until we have something that boots...
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 9076355522..01a06b7c27 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1,43 +1 @@
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-
-PCMCIA_MANAGER ?= "pcmciautils"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
-
-# Ethernet modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
-                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-
-# USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-                             kernel-module-g-serial kernel-module-g-ether"
-
-# Wireless Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
-                             kernel-module-hermes kernel-module-orinoco \
-                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
-                             hostap-conf orinoco-conf"
-
-# Sound Modules
-###BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-BOOTSTRAP_EXTRA_SOUND 	  = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
-                             kernel-module-snd-pcm  \
-                             kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
-			     
-###BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-poodle kernel-module-snd-soc-wm8731 "
+require conf/machine/include/zaurus-2.6.conf
diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.conf
new file mode 100644
index 0000000000..83ddf24b87
--- /dev/null
+++ b/conf/machine/include/qemu.conf
@@ -0,0 +1,10 @@
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_INSTALL += "gaim sylpheed"
+
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
+
+IMAGE_FSTYPES ?= "tar.bz2 ext2"
+
+ROOT_FLASH_SIZE = "100"
diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf
index c7805c36fe..f3591b4b75 100644
--- a/conf/machine/include/tosa-2.6.conf
+++ b/conf/machine/include/tosa-2.6.conf
@@ -1,6 +1,6 @@
-include conf/machine/include/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-2.6.conf
 # wlan-ng Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
+MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
 
 # WM97xx Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
+#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf
index 936b137517..992f1923c6 100644
--- a/conf/machine/include/tune-arm920t.conf
+++ b/conf/machine/include/tune-arm920t.conf
@@ -1,2 +1,3 @@
-TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
+PACKAGE_ARCH = "armv4t" 
+TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t -mcpu=arm920t"
 
diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf
index 5e2f6b7c62..31fe8868ca 100644
--- a/conf/machine/include/tune-arm926ejs.conf
+++ b/conf/machine/include/tune-arm926ejs.conf
@@ -1,3 +1,5 @@
-#if gcc breaks change arm926ejs to arm926ej-s
-TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
+# For gcc 3.x you need:
+#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
+# For gcc 4.x you need:
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
 PACKAGE_ARCH = "armv5te"
diff --git a/conf/machine/include/tune-ep9312.conf b/conf/machine/include/tune-ep9312.conf
index f7a6fb845b..0982cf2a13 100644
--- a/conf/machine/include/tune-ep9312.conf
+++ b/conf/machine/include/tune-ep9312.conf
@@ -1,4 +1,4 @@
-TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312"
+TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
 # add "-mfp=maverick" for newer gcc versions > 4.0
 
 #set arch to ep9312 for all generated packages
diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf
index 2976e0a641..990aee54bc 100644
--- a/conf/machine/include/tune-iwmmxt.conf
+++ b/conf/machine/include/tune-iwmmxt.conf
@@ -1,6 +1,6 @@
 # Configurations for the Intel PXA27x Appications Processor Family. 
 # Please use tune-xscale for PXA255/PXA26x based processors.
-IPKG_ARCHS += "iwmmxt"
-TARGET_CC_ARCH = "-march=iwmmxt -mtune=iwmmxt"
+IPKG_EXTRA_ARCHS += "iwmmxt"
+TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
 PACKAGE_ARCH = "iwmmxt"
 
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf
new file mode 100644
index 0000000000..ce9b44c9fe
--- /dev/null
+++ b/conf/machine/include/zaurus-2.6.conf
@@ -0,0 +1,20 @@
+# Zaurus Clamshell specific configuration for kernel 2.6
+# Don't forget to include zaurus-clamshell.conf as well
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_VERSION_wpa_supplicant = "0.4.7"
+
+PCMCIA_MANAGER ?= "pcmciautils"
+
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen"
+MACHINE_FEATURES_append_tosa  = " usbhost usbwlanng "
+MACHINE_FEATURES_append_akita = " usbhost "
+MACHINE_FEATURES_append_spitz = " usbhost ext2 "
+
+MACHINE_EXTRA_RDEPENDS = "zaurusd"
+MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
+MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
+
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
deleted file mode 100644
index 97030e66a7..0000000000
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# Zaurus Clamshell specific configuration for kernel 2.6
-# Don't forget to include zaurus-clamshell.conf as well
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-PREFERRED_VERSION_wpa_supplicant = "0.4.7"
-
-PCMCIA_MANAGER ?= "pcmciautils"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
-
-# Ethernet modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
-                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-
-# USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-                             kernel-module-g-serial kernel-module-g-ether"
-
-# Wireless Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
-                             kernel-module-hermes kernel-module-orinoco \
-                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
-                             hostap-conf orinoco-conf"
-
-# Sound Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-BOOTSTRAP_EXTRA_SOUND 	  = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
-                             kernel-module-snd-pcm  \
-                             kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
-			     
-BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index 1e3d3d7779..e600a4926d 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -1,5 +1,5 @@
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
@@ -12,15 +12,15 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
 
 # add a summary to the jffs2 file to make it mount a lot faster
-#EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \
-#                          -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.img \
-#                          --eraseblock=0x4000"
+EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                         -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+                         --eraseblock=0x4000 -l -p"
+IMAGE_CMD_jffs2 +=	"; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+		         ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_INSTALL += "gaim sylpheed"
 
-include conf/machine/include/handheld-common.conf
-
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
 
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 07753ccf64..b361b2bf6d 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU  devices
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700"
 #use this for a hx47xx ipaq
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
@@ -18,11 +18,18 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
 			  -e 256KiB -p"
 
+IMAGE_FSTYPES ?= "jffs2"
+
 MODUTILS = "26"	
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget"
+
 PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
-BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
+BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " udev"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware"
 
 PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
 		  snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
@@ -40,9 +47,12 @@ include conf/machine/include/tune-xscale.conf
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
 #include conf/machine/include/tune-iwmmxt.conf
 
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
-HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
-                  hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
+
+# These modules are now compiled into the kernel:
+#HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \
+#                  hx4700_pcmcia hx4700_ts hx4700_power"
+
+HX4700_MODULES = "i2c-pxa hx4700_voltage hx4700_acx snd_hx4700_audio"
 
 
 module_autoload_evdev = "evdev"
diff --git a/conf/machine/native.conf b/conf/machine/native.conf
index 4817b2e3f1..d3c77bf9bd 100644
--- a/conf/machine/native.conf
+++ b/conf/machine/native.conf
@@ -3,11 +3,11 @@
 #@DESCRIPTION: Machine configuration for your build station
 
 TARGET_ARCH = "${BUILD_ARCH}"
-IPKG_ARCHS = "all ${TARGET_ARCH}"
 TARGET_PREFIX = ""
 VENDOR = "-oe"
 
 PREFERRED_PROVIDER_virtual/kernel = "native-kernel"
-ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++"
+ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++ virtual/libc virtual/libintl virtual/libiconv"
 ASSUME_PROVIDED += "binutils-cross"
+ASSUME_PROVIDED += "virtual/libiconv virtual/libintl virtual/libc"
 
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index d24324a598..7069639330 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -2,10 +2,11 @@
 #@NAME: Nokia 770 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
+PREFERRED_PROVIDER_tslib = "tslib-maemo"
 
 XSERVER = "xserver-kdrive-omap"
 
@@ -13,22 +14,23 @@ XSERVER = "xserver-kdrive-omap"
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
-#include conf/machine/include/tune-arm926ejs.conf
-
+include conf/machine/include/tune-arm926ejs.conf
 
 #size of the root partition (yes, it is 123 MB)
 ROOT_FLASH_SIZE = "123"
 EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
 
+IMAGE_FSTYPES ?= "jffs2"
+
 # serial console port on devboard rev. B3
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init \
- apm  ppp wireless-tools console-tools"
-
 #use this if you are using the nokia initfs
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
 
+MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index f3edef9890..c32353f01e 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -3,44 +3,13 @@
 #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te qemuarm"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
-PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
-
-include conf/machine/include/handheld-common.conf
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/qemu.conf
+require conf/machine/include/tune-arm926ejs.conf
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-pcmciautils apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
-
-# Ethernet modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-#                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-#                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm \
-#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-
-IMAGE_FSTYPES = "ext2"
-
-ROOT_FLASH_SIZE = "100"
-# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
-# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte
+MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file
diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf
index d73ab85f87..36974d1336 100644
--- a/conf/machine/sun4cdm.conf
+++ b/conf/machine/sun4cdm.conf
@@ -1,13 +1,11 @@
 TARGET_ARCH = "sparc"
 
-IMAGE_FSTYPE = "cramfs"
+IMAGE_FSTYPES = "cramfs"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel module-init-tools udev"
 
 udevdir = "/dev"
 OLDEST_KERNEL = "2.6.5"
 
-IPKG_ARCHS = "sparc"
-
 PREFERRED_PROVIDER_virtual/kernel = "linux-sun4cdm"
 
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 02583c9fae..0953f6d041 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -2,13 +2,17 @@
 #@NAME: X86
 #@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines
 
-TARGET_ARCH = "i386"
+# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+TARGET_ARCH = "i486"
 # TARGET_VENDOR = "-oe"
-IPKG_ARCHS = "all i386 x86"
+IPKG_EXTRA_ARCHS = "x86"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+# todo: convert to task-base
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 
 udevdir = "/dev"
-OLDEST_KERNEL = "2.6.5"
-# GLIBC_ADDONS = "nptl"
-# GLIBC_EXTRA_OECONF = "--with-tls"
+OLDEST_KERNEL = "2.6.17"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+#require conf/machine/include/tune-x86.conf