merge of '0b0e5efd590cdcc1847caa5505a008258f7a2e45'

     and 'b95778d4aa9b6135b43b0d0a7b8b4f0d28d0be95'

14 files changed, 53 insertions, 26 deletions

diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf
index 71690ac62f..4502422021 100644
--- a/conf/distro/openomap.conf
+++ b/conf/distro/openomap.conf
@@ -33,3 +33,5 @@ PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
 PREFERRED_VERSION_glibc ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs pcmcia usbhost"
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index aad664deea..6b6e5a8ea9 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -18,6 +18,8 @@ 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-boot-usb-native"
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 0358864c70..e14efa76a0 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-2.6.conf
 
 IPKG_EXTRA_ARCHS += "iwmmxt" 
 IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 4b1d8edb80..893378f569 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -3,7 +3,7 @@
 #@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"
 
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index 8345ff5fd8..35cb1d2070 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -17,5 +17,7 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
+MACHINE_FEATURES = "kernel26 usbhost ext2"
+
 require conf/machine/include/tune-athlonmp.conf
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 45eda7251f..65f27085f4 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -14,6 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 ROOT_FLASH_SIZE = "32"
 PCMCIA_MANAGER = "pcmciautils"
 
+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"
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
index 008bfb252f..2ab9775419 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5xxx.conf
@@ -18,7 +18,7 @@ EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
 
 ROOT_FLASH_SIZE = "32"
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget usbhost"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost"
 
 BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}"
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index eff0ad4c7c..01a06b7c27 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1 +1 @@
-require conf/machine/include/zaurus-clamshell-2.6.conf
+require conf/machine/include/zaurus-2.6.conf
diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf
index 6831b0ea91..f3591b4b75 100644
--- a/conf/machine/include/tosa-2.6.conf
+++ b/conf/machine/include/tosa-2.6.conf
@@ -1,4 +1,4 @@
-include conf/machine/include/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-2.6.conf
 # wlan-ng Modules
 MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
 
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-2.6.conf
index e0a9e38e91..ce9b44c9fe 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-2.6.conf
@@ -6,10 +6,10 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
-MACHINE_FEATURES_akita = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost"
-MACHINE_FEATURES_spitz = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost ext2"
-
+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"
@@ -17,4 +17,4 @@ 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"
\ No newline at end of file
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 84380a49d0..b361b2bf6d 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -22,7 +22,7 @@ IMAGE_FSTYPES ?= "jffs2"
 
 MODUTILS = "26"	
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget"
 
 PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
index fb8b521a3c..c480cf4ebf 100755
--- a/conf/machine/netbook-pro.conf
+++ b/conf/machine/netbook-pro.conf
@@ -15,6 +15,8 @@ USE_VT = "0"
 #use the epson xserver
 XSERVER = "xserver-kdrive-epson"
 
+MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost"
+
 #ship in rootfs:
 NBP_MODULES = 	" apm \
                   pcmcia-core \
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index fc17985233..ea86d0c5cc 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -17,25 +17,41 @@ PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020"
 PREFERRED_VERSION_linux-omap1 = "2.6.x+git"
 #PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
-
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
+MACHINE_FEATURES = "kernel26 pcmcia usbhost"
+
+MACHINE_TASK_PROVIDER = "task-base"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
+                          kernel-module-ide-disk \
+                          kernel-module-ide-core \
+                          kernel-module-nls-iso8859-1 \
+                          kernel-module-nls-cp437 \
+                          kernel-module-nls-base \
+                          kernel-module-vfat"
+
+include conf/machine/include/tune-arm926ejs.conf
+
+# old modules setup - partially need to be added into MACHINE_EXTRA_RRECOMMENDS
+
 # PCMCIA Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf"
+##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"
+##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf"
+
 # IDE modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core"
+
 # DOS and VFAT modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat"
+
 # Video er LCD Driver
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea"
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor"
-# DSP Interface
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"
+##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea"
+##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor"
 
-include conf/machine/include/tune-arm926ejs.conf
+# DSP Interface
+##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index af50217e0f..5434efbaf6 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-2.6.conf
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"