merge of '5281adaea9fd65292934a8ed7fa0e871e220ca7f'

     and 'db972685a453721f344867c46d01ba28142c82bf'

5 files changed, 37 insertions, 13 deletions

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/omap1710h3.conf b/conf/machine/omap1710h3.conf
index 0b26436bf5..73dced352e 100644
--- a/conf/machine/omap1710h3.conf
+++ b/conf/machine/omap1710h3.conf
@@ -1,12 +1,12 @@
 #@TYPE: Machine
-#@NAME: OMAP1610 cpu on an H2 board
-#@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
+#@NAME: OMAP1710 cpu on an H2 board
+#@DESCRIPTION: Machine configuration for the OMAP H3 development board with a 1710 processor
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf
index a9e1a00cc5..fb9f4669da 100644
--- a/conf/machine/omap2420h4.conf
+++ b/conf/machine/omap2420h4.conf
@@ -1,17 +1,16 @@
 #@TYPE: Machine
-#@NAME: OMAP1610 cpu on an H2 board
-#@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
+#@NAME: OMAP2420 cpu on an H4 board
+#@DESCRIPTION: Machine configuration for the OMAP H4 development board with a 2420 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv5te armv6te"
-
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te armv6"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
+PREFERRED_VERSION_u-boot = "1.1.4"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+MACHINE_FEATURES = "kernel26"
+
+require conf/machine/include/tune-arm1136jf-s.conf
diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf
new file mode 100644
index 0000000000..ebb7a14b06
--- /dev/null
+++ b/conf/machine/x86-32-nocona.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: x86-nocona
+#@DESCRIPTION: Machine configuration for Intel 'Nocona' processor in 32-bit mode
+#
+
+TARGET_ARCH = "i686"
+MACHINE_ARCH = "x86-32-nocona"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
+
+require conf/machine/include/tune-x86-nocona.conf
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+OLDEST_KERNEL = "2.6.20"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+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 549a949a8b..2b0ef0e922 100644
--- a/conf/machine/x86-prescott.conf
+++ b/conf/machine/x86-prescott.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for a generic i686 machine
 
 TARGET_ARCH = "i686"
-PACKAGE_ARCH = "x86-prescott"
+MACHINE_ARCH = "x86-prescott"
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
 
 require conf/machine/include/tune-x86-prescott.conf