merge of '3d4a85aa2c2724b95dcfd705b2078392bd5fe7fa'

     and 'ed8e9ddaa8dd95860ce2c4ae76ec55966ab9f78c'

5 files changed, 64 insertions, 6 deletions

diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index 268b2a361c..0ca65b79a9 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -1,21 +1,26 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #@TYPE: Machine
 #@Name: DHT-Walnut Development Platform
 #@DESCRIPTION: Machine configuration for the DHT-Walnut 405GP  development platform
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc405"
+PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc405"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 MACHINE_FEATURES = "kernel26 ext2"
+MACHINE_TASK_PROVIDER = "task-base"
 
 TARGET_CPU = "405"
-OLDEST_KERNEL = "2.6.12"
+OLDEST_KERNEL = "2.6.18"
 
-#tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+#don't try to access tty1
+USE_VT = "0"
 
+SERIAL_CONSOLE = "115200 ttyS0"
 
 
-SERIAL_CONSOLE = "115200 ttyS0"
+#tune for the 405 cpu
+require conf/machine/include/tune-ppc405.conf
 
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
new file mode 100644
index 0000000000..6abdf0e25b
--- /dev/null
+++ b/conf/machine/i586-generic.conf
@@ -0,0 +1,25 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: i586-generic
+#@DESCRIPTION: Machine configuration for a generic i586 machine
+
+
+TARGET_ARCH = "i586"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+OLDEST_KERNEL = "2.6.18"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_TASK_PROVIDER = "task-base"
+
+
+
+#tune for the i586 cpu
+require conf/machine/include/tune-i586.conf
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
new file mode 100644
index 0000000000..21549653f6
--- /dev/null
+++ b/conf/machine/i686-generic.conf
@@ -0,0 +1,24 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: i686-generic
+#@DESCRIPTION: Machine configuration for a generic i686 machine
+
+
+TARGET_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+OLDEST_KERNEL = "2.6.18"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_TASK_PROVIDER = "task-base"
+
+
+#tune for the i686 cpu
+require conf/machine/include/tune-i686.conf
diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf
index 19dae402d9..756e064c6a 100644
--- a/conf/machine/magicbox.conf
+++ b/conf/machine/magicbox.conf
@@ -1,3 +1,5 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #@TYPE: Machine
 #@Name: Magicbox router board
 #@DESCRIPTION: Machine configuration for Magicbox router board http://wwww.magicbox.pl
diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf
index b2d0f3593e..2336ecbcf3 100644
--- a/conf/machine/sequoia.conf
+++ b/conf/machine/sequoia.conf
@@ -1,3 +1,5 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #@TYPE: Machine
 #@Name: AMCC Sequoia Development Platform
 #@DESCRIPTION: Machine configuration for the AMCC Sequoia development platform http://www.amcc.com/Embedded/Downloads/440EPx/
@@ -17,7 +19,7 @@ USE_VT = "0"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-PREFERRED_VERSION_u-boot = "1.1.2"
+PREFERRED_VERSION_u-boot = "git"
 EXTRA_IMAGECMD = "--big-endian"
 ERASEBLOCK_SIZE = "0x10000"
 IMAGE_FSTYPES = "jffs2"