merge of '1d0e13e8c6528e7a7037276e3c01cb21dfa085e4'

     and '86581f7de9bc72fe5e21778b4442cc0e59e96fbf'

40 files changed, 311 insertions, 48 deletions

diff --git a/conf/machine/adsp-bf537-stamp.conf b/conf/machine/adsp-bf537-stamp.conf
index 2a8fd640e7..2bbbf48666 100644
--- a/conf/machine/adsp-bf537-stamp.conf
+++ b/conf/machine/adsp-bf537-stamp.conf
@@ -5,7 +5,7 @@
 
 TARGET_ARCH = "bfin"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel = "linux-bfin"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 #don't try to access tty1
diff --git a/conf/machine/adzs-bf538f-ezlite.conf b/conf/machine/adzs-bf538f-ezlite.conf
index 5078789402..9548b22b90 100644
--- a/conf/machine/adzs-bf538f-ezlite.conf
+++ b/conf/machine/adzs-bf538f-ezlite.conf
@@ -2,10 +2,9 @@
 #@Name: Analog Devices blackfin platfrom
 #@DESCRIPTION: ADSP-BF538(F) EZ-KIT Board (http://www.analog.com/en/epHSProd/0,,BF538-HARDWARE,00.html)
 
-
 TARGET_ARCH = "bfin"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel = "linux-bfin"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 #don't try to access tty1
diff --git a/conf/machine/adzs-bf548-ezlite.conf b/conf/machine/adzs-bf548-ezlite.conf
new file mode 100644
index 0000000000..35c9217339
--- /dev/null
+++ b/conf/machine/adzs-bf548-ezlite.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@Name: Analog Devices blackfin platfrom
+#@DESCRIPTION: ADSP-BF548 EZ-LITE KIT Board (http://www.analog.com/en/epHSProd/0,,BF548-HARDWARE,00.html)
+
+TARGET_ARCH = "bfin"
+
+KERNEL_IMAGETYPE = "vmlinux"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-bfin"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200"
+
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 06d5946523..0f5eaca9cc 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -6,6 +6,8 @@ require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
+MACHINE_FEATURES += "iwmmxt"
+
 IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "58"
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index 29af29a3b8..3c50ef561b 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: Alix
-#@DESCRIPTION: Machine configuration for PC Engines Alix1c board
+#@DESCRIPTION: Machine.inciguration for PC Engines Alix1c board
 #
 # http://pcengines.ch/alix1c.htm
 
@@ -15,9 +15,9 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86"
 
-require conf/machine/include/tune-geodelx.conf
+require.inc/machine/include/tune-geodelx.inc
 
 IMAGE_FSTYPES += "tar.gz"
 
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index e8903a960a..07616915aa 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@Name: Atmel AT91SAM9260EK Development Platform
-#@DESCRIPTION: Machine configuration for the at91sam9260ek development board with a at91sam9260 processor
+#@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
@@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
+KERNEL_IMAGETYPE = "uImage"
+
 #don't try to access tty1
 USE_VT = "0"
 
@@ -17,4 +19,4 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
 SERIAL_CONSOLE = "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index 489575cd2b..b6ccd7ef0d 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@Name: Atmel AT91SAM9261EK Development Platform
-#@DESCRIPTION: Machine configuration for the at91sam9261ek development board with a at91sam9261 processor
+#@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
@@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
+KERNEL_IMAGETYPE = "uImage"
+
 #don't try to access tty1
 USE_VT = "0"
 
@@ -17,4 +19,4 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
 SERIAL_CONSOLE = "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf
new file mode 100644
index 0000000000..fe7ff724fd
--- /dev/null
+++ b/conf/machine/bd-neon.conf
@@ -0,0 +1,57 @@
+#@TYPE: Machine
+#@NAME: Boundary Devices NEON
+#@DESCRIPTION: Machine configuration for the Boundary Devices NEON board
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.inc
+
+# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
+#require conf/machine/include/tune-iwmmxt.inc
+
+ROOT_FLASH_SIZE = "60"
+VOLATILE_STORAGE_SIZE = "128"
+GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa usbgadget screen uboot"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PERFERRED_VERSION_linux = "2.6.22"
+
+MODUTILS = "26"	
+XSERVER = "xserver-kdrive-fbdev"
+
+PREFERRED_VERSION_u-boot = "1.1.2"
+
+EXTRA_IMAGEDEPENDS =" mtd-utils"
+
+MACHINE_EXTRA_RDEPENDS = " mtd-utils"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-module-nls-cp437 \
+				kernel-module-nls-iso8859-1 \
+				kernel-module-nls-utf8 \
+				kernel-module-af-key \
+				kernel-module-i2c-pxa"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x40000 --pad=32243712; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+			  -e 128KiB -p"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_evdev = "evdev"
+module_autoload_mmc_block = "mmc_block"
+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"
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/cm-x270.conf
index ff0eb42a11..2522897042 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/cm-x270.conf
@@ -1,13 +1,14 @@
 #@TYPE: Machine
-#@Name: Compulab PXA270 system
-#@DESCRIPTION: Machine configuration for Compulab PXA270 system
+#@Name: Compulab cm-x270
+#@DESCRIPTION: Machine configuration for Compulab cm-x270 computer module
 #OLDEST_KERNEL = "2.6.16"
 TARGET_ARCH = "arm"
-PREFERRED_VERSION_compulab-pxa270 = "2.6.22"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.23"
+
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
 require conf/machine/include/tune-xscale.inc
 
@@ -16,12 +17,19 @@ require conf/machine/include/tune-xscale.inc
 # the following line to your local.conf:
 #   CMX270_CONSOLE_SERIAL_PORT = "ttyS0"
 
+# NAND flash eraseblock size
+# most of the older cm-x270 modules are populated with NAND flash
+# that have 128KiB eraseblocks.  Recently, a user encounted
+# a device that has 16KiB eraseblocks.  The following define
+# can be overridden in local.conf if you have one of these devices.
+CMX270_NAND_ERASEBLOCK_SIZE ?= "0x20000"
+
 # the following is for the cm-x270 L module
 CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
 
 # used by sysvinit_2 package, so rebuild this
 # package if you change the SERIAL_CONSOLE setting
-# the following is the for the cm-x270 L module
+# the following is the port for the cm-x270 L module
 # I think the W module would use ttyS0, but has
 # not been tested.  This can be overwritten in 
 # local.conf
@@ -31,16 +39,16 @@ SERIAL_CONSOLE ?= "38400 ${CMX270_CONSOLE_SERIAL_PORT}"
 ROOT_FLASH_SIZE ?= "32"
 
 # for NAND flash.
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad --no-cleanmarkers;\
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${CMX270_NAND_ERASEBLOCK_SIZE} --pad --no-cleanmarkers;\
 	sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-	-e 0x20000 -p; \
+	-e ${CMX270_NAND_ERASEBLOCK_SIZE} -p; \
 	cd ${DEPLOY_DIR_IMAGE}; \
 	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
 	ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
 	"
 
-MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa iwmmxt"
 
 # to program the compulab NAND flash, the following scheme is suggested.  Create
 # a small rootfs that can fit in NOR flash using the following config:
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index ead6a83282..c31aecd550 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -11,7 +11,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 UBOOT_ENTRYPOINT = "0"
 
 MACHINE_FEATURES = "kernel26 ext2"
-MACHINE_TASK_PROVIDER = "task-base"
 
 TARGET_CPU = "405"
 OLDEST_KERNEL = "2.6.18"
diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf
new file mode 100644
index 0000000000..95ba519d3b
--- /dev/null
+++ b/conf/machine/em-x270.conf
@@ -0,0 +1,68 @@
+#@TYPE: Machine
+#@NAME: EM-X270
+#@DESCRIPTION: Machine configuration for the CompuLab EM-X270 with a pxa27x CPU
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+GUI_MACHINE_CLASS ?= "bigscreen"
+
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+#require conf/machine/include/tune-xscale.inc
+
+# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
+# require conf/machine/include/tune-iwmmxt.inc
+
+require conf/machine/include/tune-xscale.inc
+
+ROOT_FLASH_SIZE = "128"
+IMAGE_CMD_jffs2 = " \
+/usr/sbin/mkfs.jffs2 --root=${IMAGE_ROOTFS} \
+		     --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+		     --eraseblock=0x20000 --pad --faketime -n; \
+/usr/sbin/sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+		  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+		  -e 0x20000 -p; \
+	          cd ${DEPLOY_DIR_IMAGE}; \
+		  rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
+	          ln -fs ${IMAGE_NAME}.rootfs-summary.jffs2 \
+		         ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
+"
+
+#VOLATILE_STORAGE_SIZE = "128"
+MACHINE_DISPLAY_WIDTH_PIXELS ?= "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS ?= "640"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth wifi usbhost usbgadget screen phone "
+
+#
+# Software/packages selection
+#
+
+#PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_VERSION_em-x270 = "2.6.23"
+MODUTILS = "26"	
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#PREFERRED_VERSION_orinoco-modules = "0.15rc1"
+
+MACHINE_EXTRA_RDEPENDS = ""
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
+				kernel-module-nls-iso8859-1 \
+				kernel-module-nls-utf8 \
+				"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_evdev = "evdev"
+module_autoload_mmc_block = "mmc_block"
+module_autoload_pxa27x_udc = "pxa27x_udc"
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 0750e4d646..b423f83f00 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -12,7 +12,6 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
-MACHINE_TASK_PROVIDER = "task-base"
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 
 require conf/machine/include/tune-c3.inc
diff --git a/conf/machine/er0100.conf b/conf/machine/er0100.conf
new file mode 100644
index 0000000000..211091d929
--- /dev/null
+++ b/conf/machine/er0100.conf
@@ -0,0 +1,46 @@
+#@TYPE: Machine
+#@NAME: iRex Iliad e-ink reader
+#@DESCRIPTION: Machine configuration for the iRex Iliad e-ink reader
+
+#
+# Hardware-based properties
+#
+
+# CPU: Intel (now Marvell) PXA255
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.inc
+
+# Fix us:
+
+#ROOT_FLASH_SIZE = "80"
+#VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "768"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "1024"
+MACHINE_FEATURES = "kernel24 touchscreen apm alsa pcmcia wifi usbgadget usbhost screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-er0100"
+PCMCIA_MANAGER = "pcmcia-cs"
+MODUTILS = "24"	
+XSERVER = "xserver-kdrive-fbdev"
+
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_evdev = "evdev"
+module_autoload_pcmcia = "pcmcia"
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
+
+USE_VT = "0"
+SERIAL_CONSOLE = "-L ttyS2 115200 vt100"
+
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index ffd3584da6..bd14df5814 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -5,7 +5,8 @@
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
+MACHINE_CLASS = "neo1973"
+PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 99eb9f0832..1760424fc8 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -5,7 +5,8 @@
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
+MACHINE_CLASS = "neo1973"
+PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
@@ -44,3 +45,6 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
+
+# build YAFFS2
+IMAGE_FSTYPES ?= "jffs2 yaffs2"
diff --git a/conf/machine/ghi270.conf b/conf/machine/ghi270.conf
new file mode 100644
index 0000000000..3536485cab
--- /dev/null
+++ b/conf/machine/ghi270.conf
@@ -0,0 +1,46 @@
+#@TYPE: Machine
+#@NAME: GHI270 / DuraMax H / DuraMaxHG
+#@DESCRIPTION: Machine configuration for the GHI270 platform with a pxa27x CPU
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.inc
+
+# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
+#require conf/machine/include/tune-iwmmxt.inc
+
+EXTRA_IMAGECMD_jffs2_ghi270 = "-p -n -e 16KiB"
+
+ROOT_FLASH_SIZE = "64"
+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 screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_VERSION_linux-handhelds-2.6               = "2.6.21-hh11"
+
+PCMCIA_MANAGER = "pcmciautils"
+MODUTILS = "26"
+
+#PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
+
+#PREFERRED_VERSION_orinoco-modules = "0.15rc1"
+
+#
+# Modules autoload and other boot properties
+#
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttySA0"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index 626e755b1f..f17451556f 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -17,7 +17,7 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen x86"
 
 #require conf/machine/include/tune-athlonmp.inc
 
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 2dac4b48af..15390d2d56 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -21,7 +21,6 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 6aa1885293..44454f3902 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -21,7 +21,6 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 634b388f96..c3e7cf710e 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -18,6 +18,7 @@ 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 += "iwmmxt"
 
 #
 # Software/packages selection
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 141470b5a4..87e03a7bdd 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -20,6 +20,7 @@ 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_FEATURES += "iwmmxt"
 
 #
 # Software/packages selection
@@ -29,7 +30,6 @@ PCMCIA_MANAGER = "pcmciautils"
 MODUTILS = "26"	
 
 XSERVER = "xserver-kdrive-w100"
-PREFERRED_VERSION_xserver-kdrive = "1.2.0"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index 0ef522441b..f2a1869b99 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -19,9 +19,8 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
 
 
 #tune for pentium cpu
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index 8ff87553ba..5399316cd5 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -18,9 +18,8 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
 
 #tune for pentium pro cpu
 require conf/machine/include/tune-pentiumpro.inc
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 4f66f92cf0..fc5fd4e136 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -13,6 +13,7 @@ module_autoload_mmc_block = "mmc_block"
 module_autoload_gumstix_gadget = "gumstix_gadget"
 module_autoload_g_ether = "g_ether"
 module_autoload_smc91x = "smc91x"
+module_autoload_smc911x = "smc911x"
 
 UBOOT_ENTRYPOINT = "a0008000"
 
@@ -33,8 +34,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
                              kernel-module-rtc-sysfs \
                              kernel-module-smc91x \
                              kernel-module-gumstix-smc91x \
-                             "          
-
+                             kernel-module-smc911x \
+                             kernel-module-gumstix-smc911x \
+                             "
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 3912d8fc9b..87571c0db0 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -12,6 +12,9 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
 #mtd3: 00020000 00020000 "Logo"
 
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
+MACHINE_FEATURES += "iwmmxt"
+
+
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_DISPLAY_ORIENTATION = "0"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 979a6bd484..4bcd36e2ab 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -21,7 +21,8 @@ include conf/machine/include/tune-xscale.inc
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf
index 178c242056..9839b6d69e 100644
--- a/conf/machine/magicbox.conf
+++ b/conf/machine/magicbox.conf
@@ -12,7 +12,6 @@ PACKAGE_EXTRA_ARCHS = "ppc405"
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 MACHINE_FEATURES = "kernel26"
-MACHINE_TASK_PROVIDER = "task-base"
 
 TARGET_CPU = "405"
 OLDEST_KERNEL = "2.6.18"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 60cc9af3d1..900b24b751 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -14,12 +14,16 @@ require conf/machine/include/tune-xscale.inc
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
 #require conf/machine/include/tune-iwmmxt.inc
 
-ROOT_FLASH_SIZE = "80"
+ROOT_FLASH_SIZE = "60"
 VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 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 += "iwmmxt"
+
 
 #
 # We don't support jffs2 installations (yet).
@@ -32,6 +36,7 @@ IMAGE_FSTYPES = "tar.bz2"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 MODUTILS = "26"	
 XSERVER = "xserver-kdrive-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 8d6cd2d220..3ee97a447e 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa"
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa x86"
 ROOT_FLASH_SIZE = "64"
 GUI_MACHINE_CLASS = "bigscreen"
 
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index 2f92eb4158..bbeaf3a4a2 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -10,6 +10,7 @@ MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "320"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES += "pcmcia wifi"
+MACHINE_FEATURES += "iwmmxt"
 
 
 MACHINE_EXTRA_RRECOMMENDS += "\
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index ffa7dad468..2a8c009b10 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -15,7 +15,7 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen x86"
 
 IMAGE_FSTYPES = "tar.gz"
 
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
index 2378a9990e..fe811ba54e 100644
--- a/conf/machine/qemux86.conf
+++ b/conf/machine/qemux86.conf
@@ -7,6 +7,8 @@ PACKAGE_EXTRA_ARCHS = "x86"
 
 require conf/machine/include/qemu.inc
 
+MACHINE_FEATURES += "x86"
+
 KERNEL_IMAGETYPE = "bzImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/rokre2.conf b/conf/machine/rokre2.conf
index 621e95f166..1a99c877ce 100644
--- a/conf/machine/rokre2.conf
+++ b/conf/machine/rokre2.conf
@@ -6,3 +6,5 @@ require conf/machine/include/motorola-ezx-base.inc
 
 # there is no touchscreen
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
+MACHINE_FEATURES += "iwmmxt"
+
diff --git a/conf/machine/rokre6.conf b/conf/machine/rokre6.conf
index 7b20091140..044a65c9fa 100644
--- a/conf/machine/rokre6.conf
+++ b/conf/machine/rokre6.conf
@@ -4,5 +4,3 @@
 
 require conf/machine/include/motorola-ezx-base.inc
 
-# there is no touchscreen
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf
index 72f0a8feb2..b391f4e277 100644
--- a/conf/machine/sequoia.conf
+++ b/conf/machine/sequoia.conf
@@ -11,7 +11,6 @@ PACKAGE_EXTRA_ARCHS = "all  ${MACHINE} ppc ppc440e"
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 MACHINE_FEATURES = "kernel26 usbhost"
-MACHINE_TASK_PROVIDER = "task-base"
 
 #don't try to access tty1
 USE_VT = "0"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 3199065606..32060d090c 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -5,6 +5,8 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
+MACHINE_FEATURES += "iwmmxt"
+
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt"
diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
index d73c80214c..92720043f2 100644
--- a/conf/machine/wrap.conf
+++ b/conf/machine/wrap.conf
@@ -22,7 +22,7 @@ USE_DEVFS = "0"
 IMAGE_FSTYPE ?= "tar.gz"
 
 # Things to include in the fs image
-MACHINE_FEATURES = "kernel26 pci ext2"
+MACHINE_FEATURES = "kernel26 pci ext2 x86"
 # The kernel and grub need to installed to boot from flash
 MACHINE_EXTRA_RDEPENDS = "kernel grub"
 
diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf
index ad5badf84a..20b5a11770 100644
--- a/conf/machine/x86-32-nocona.conf
+++ b/conf/machine/x86-32-nocona.conf
@@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
+
 
diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf
index b4021a6496..6a91bc39fb 100644
--- a/conf/machine/x86-prescott.conf
+++ b/conf/machine/x86-prescott.conf
@@ -16,7 +16,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
+
 
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 51757e950c..c35e7ad389 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -13,7 +13,7 @@ KERNEL_IMAGETYPE = "bzImage"
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen"
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen x86"
 
 udevdir = "/dev"
 OLDEST_KERNEL = "2.6.17"