8 files changed, 15 insertions, 31 deletions
diff --git a/conf/machine/gumstix-connex.conf b/conf/machine/gumstix-connex.conf
index 5110e86aff..a431762d0a 100644
--- a/conf/machine/gumstix-connex.conf
+++ b/conf/machine/gumstix-connex.conf
@@ -1,2 +1,6 @@
 require conf/machine/include/gumstix.inc
 
+MACHINE_FEATURES += " usbgadget "
+
+GUMSTIX_400MHZ = "y"
+
diff --git a/conf/machine/gumstix-verdex.conf b/conf/machine/gumstix-verdex.conf
index f08e3bafad..ab24552646 100644
--- a/conf/machine/gumstix-verdex.conf
+++ b/conf/machine/gumstix-verdex.conf
@@ -2,3 +2,5 @@ require conf/machine/include/gumstix.inc
 
 PACKAGE_EXTRA_ARCHS += " iwmmxt "
 
+MACHINE_FEATURES += " usbhost "
+
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 9d51cdcead..c271940f63 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -13,17 +13,13 @@ module_autoload_mmc_block = "mmc_block"
 module_autoload_gumstix_gadget = "gumstix_gadget"
 module_autoload_g_ether = "g_ether"
 
-OLDEST_KERNEL = "2.6.15"
-
 UBOOT_ENTRYPOINT = "a0008000"
 
 #Assume people have some gumstix extension boards 
-MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget bluetooth"
+MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
 
-GUMSTIX_400MHZ = "y"
-
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-unix \
                              kernel-module-rtc-core \
                              kernel-module-rtc-dev \
diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.conf
index 68316f36bf..a69df825c0 100644
--- a/conf/machine/include/tune-arm1136jf-s.conf
+++ b/conf/machine/include/tune-arm1136jf-s.conf
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
-PACKAGE_ARCH = "armv6"
-\ No newline at end of file
+FEED_ARCH = "armv6"
+PACKAGE_ARCH = "armv6"
diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf
index 373bf46727..b142d3325a 100644
--- a/conf/machine/include/tune-arm920t.conf
+++ b/conf/machine/include/tune-arm920t.conf
@@ -1,3 +1,4 @@
+FEED_ARCH = "armv4t"
 PACKAGE_ARCH = "armv4t" 
 TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
 
diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf
index 31fe8868ca..c3e8d7aefc 100644
--- a/conf/machine/include/tune-arm926ejs.conf
+++ b/conf/machine/include/tune-arm926ejs.conf
@@ -1,3 +1,5 @@
+FEED_ARCH = "armv5te"
+
 # For gcc 3.x you need:
 #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
 # For gcc 4.x you need:
diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.conf
index 1d212946e4..f14aee9aed 100644
--- a/conf/machine/include/tune-xscale.conf
+++ b/conf/machine/include/tune-xscale.conf
@@ -1,3 +1,5 @@
+FEED_ARCH = "armv5te"
+
 TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
 TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
 PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index 946a619d3f..091d511118 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -3,13 +3,10 @@
 #@DESCRIPTION: Machine configuration for the OMAP Starter Kit with a 5912 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv5te"
-
-HOTPLUG = "udev"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 # PREFERRED_VERSION_u-boot = "1.1.6"
 
@@ -30,24 +27,3 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
 
 require 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"
-
-# IDE modules
-#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"
-
-# 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"