merge of '266f6beb86630b70cfa55df7d2b557a677d187b0'

     and '893542e48954804c96a716027237dc29c119d78b'

7 files changed, 16 insertions, 9 deletions

diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 9d51cdcead..67fefd3835 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -13,23 +13,22 @@ 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 \
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
                              kernel-module-rtc-core \
                              kernel-module-rtc-dev \
                              kernel-module-rtc-proc \
                              kernel-module-rtc-sa1100 \
-                             kernel-module-rtc-sysfs"          
+                             kernel-module-rtc-sysfs \
+                             kernel-module-smc91x \
+                             kernel-module-gumstix-smc91x \
+                             "          
 
 
 # used by sysvinit_2
diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf
index 821ebc4c03..5371016ea9 100644
--- a/conf/machine/include/palm.conf
+++ b/conf/machine/include/palm.conf
@@ -57,7 +57,7 @@ module_autoload_snd-timer = "snd-timer"
 module_autoload_soundcore = "soundcore"
 module_autoload_wm97xx-ts = "wm97xx-ts"
 module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
-module_autoload_palmtx-battery = "palmtx-battery"
+module_autoload_palmtx_battery = "palmtx_battery"
 module_autoload_palmz72_battery = "palmz72_battery"
 module_autoload_i2c-dev = "i2c-dev"
 module_autoload_i2c-pxa = "i2c-pxa"
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-x86-nocona.conf b/conf/machine/include/tune-x86-nocona.conf
new file mode 100644
index 0000000000..f1189a171e
--- /dev/null
+++ b/conf/machine/include/tune-x86-nocona.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=nocona"
+TARGET_CC_KERNEL_ARCH = "-march=nocona"
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']}"