merge of 'c5d7d939915c058ea8efba4e6e2fa2e5f1648626'

     and 'd6978786d6310b56cb0f5a93790659cd481ca0d5'

8 files changed, 76 insertions, 4 deletions

diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf
index fe7ff724fd..532193a567 100644
--- a/conf/machine/bd-neon.conf
+++ b/conf/machine/bd-neon.conf
@@ -24,6 +24,8 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa usbgadget screen uboot"
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PERFERRED_VERSION_linux = "2.6.22"
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "a0008000"
 
 MODUTILS = "26"	
 XSERVER = "xserver-kdrive-fbdev"
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index c31aecd550..a8a2d60c17 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -13,13 +13,13 @@ UBOOT_ENTRYPOINT = "0"
 MACHINE_FEATURES = "kernel26 ext2"
 
 TARGET_CPU = "405"
-OLDEST_KERNEL = "2.6.18"
 
 #don't try to access tty1
 USE_VT = "0"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
+PREFERRED_VERSION_u-boot = "1.1.4"
 
 #tune for the 405 cpu
 require conf/machine/include/tune-ppc405.inc
diff --git a/conf/machine/eseries.conf b/conf/machine/eseries.conf
new file mode 100644
index 0000000000..e6552b52d1
--- /dev/null
+++ b/conf/machine/eseries.conf
@@ -0,0 +1,39 @@
+#@TYPE: Machine
+#@NAME: eseries
+#@DESCRIPTION: Machine configuration for the Toshiba eseries (e3xx/e4xx/e7xx/e8xx)
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+#Compile with armv5te optimizations, incompatible with armv4(t) cpus
+require conf/machine/include/tune-xscale.inc
+
+#Set some hints for metadata  
+VOLATILE_STORAGE_SIZE = "64"
+ROOT_FLASH_SIZE = "32"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen"
+
+#
+# Software/packages selection
+#
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/include/tune-ppc405.inc b/conf/machine/include/tune-ppc405.inc
index cf8f58c115..62118dd3a1 100644
--- a/conf/machine/include/tune-ppc405.inc
+++ b/conf/machine/include/tune-ppc405.inc
@@ -1,2 +1,4 @@
+#default to soft-floats if distro/machine/local.conf don't define anything else
+TARGET_FPU   ?=  "soft"
 TARGET_CC_ARCH = "-mcpu=405"
 PACKAGE_ARCH = "ppc405"
diff --git a/conf/machine/include/tune-ppce300c2.inc b/conf/machine/include/tune-ppce300c2.inc
new file mode 100644
index 0000000000..4d7ea7ef87
--- /dev/null
+++ b/conf/machine/include/tune-ppce300c2.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-mcpu=e300c2"
+PACKAGE_ARCH = "ppce300c2"
+
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 4bcd36e2ab..8f48c614d1 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -32,8 +32,8 @@ MACHINE_FEATURES_append_akita = " usbhost "
 MACHINE_FEATURES_append_spitz = " usbhost ext2 "
 
 MACHINE_EXTRA_RDEPENDS = "zaurusd"
-MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi"
-MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
+MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
 
diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 7b9a2723af..f32f78ee8a 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -5,7 +5,8 @@
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c3"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_u-boot = "git"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf
new file mode 100644
index 0000000000..32b97f86e5
--- /dev/null
+++ b/conf/machine/mpc8323e-rdb.conf
@@ -0,0 +1,25 @@
+#@TYPE: Machine
+#@Name: Freescale MPC8323E-RDB
+#@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB
+
+TARGET_ARCH = "powerpc"
+TARGET_FPU = "soft"
+PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c2"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+MACHINE_FEATURES = "kernel26 usbhost ext2"
+
+PREFERRED_VERSION_u-boot = "1.1.6"
+UBOOT_MACHINE = "MPC8323ERDB_config"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000"
+
+#don't try to access tty1
+USE_VT = "0"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+#tune for the e300c2 core
+require conf/machine/include/tune-ppce300c2.inc
+