propagate from branch 'org.openembedded.dev' (head acccc4840b95c279164a3eeacf893200164bdc65)

            to branch 'org.openembedded.dev.avr32' (head 4a915ee0a28076c53049330f3f2e58c7b85ef7a8)

20 files changed, 95 insertions, 55 deletions

diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index 3c50ef561b..f4423946bd 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86"
 
-require.inc/machine/include/tune-geodelx.inc
+require conf/machine/include/tune-geodelx.inc
 
 IMAGE_FSTYPES += "tar.gz"
 
diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index 0dda9492e9..b119a24359 100644
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -32,10 +32,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
-				kernel-module-nls-iso8859-1 \
-				kernel-module-nls-utf8 \
-				kernel-module-af-key \
+MACHINE_EXTRA_RRECOMMENDS = "\
 				kernel-module-i2c-pxa"
 
 #
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
new file mode 100644
index 0000000000..ecff6fae13
--- /dev/null
+++ b/conf/machine/davinci-sffsdr.conf
@@ -0,0 +1,25 @@
+#@TYPE: Machine
+#@NAME: DM6446 cpu on a Lyrtech Small Form Factor SDR board
+#@DESCRIPTION: Machine configuration for the Lyrtech Small Form Factor SDR board
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+HOTPLUG = "udev"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+
+PREFERRED_VERSION_u-boot = "git"
+UBOOT_MACHINE = "davinci_sffsdr_config"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+#ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
+
+require conf/machine/include/tune-arm926ejs.inc
+
diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf
index 95ba519d3b..3cf0a7fab2 100644
--- a/conf/machine/em-x270.conf
+++ b/conf/machine/em-x270.conf
@@ -21,10 +21,10 @@ require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "128"
 IMAGE_CMD_jffs2 = " \
-/usr/sbin/mkfs.jffs2 --root=${IMAGE_ROOTFS} \
-		     --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-		     --eraseblock=0x20000 --pad --faketime -n; \
-/usr/sbin/sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+          mkfs.jffs2 --root=${IMAGE_ROOTFS} \
+             --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+             --eraseblock=0x20000 --pad --faketime -n; \
+          sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 		  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
 		  -e 0x20000 -p; \
 	          cd ${DEPLOY_DIR_IMAGE}; \
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index bd14df5814..09517fd11d 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -16,6 +16,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
+XSERVER = "xserver-kdrive-fbdev"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 1760424fc8..4cad7924f1 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -16,6 +16,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
+XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
@@ -26,7 +27,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-s3cmci \
   kernel-module-ext2 \
   kernel-module-vfat \
-  kernel-module-snd-soc-neo1973-wm8753 \
+  kernel-module-snd-soc-neo1973-gta02-wm8753 \
   kernel-module-snd-soc-smdk2440 \
   kernel-module-nls-iso8859-1 \
   kernel-module-nls-cp437 \
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 60a732ffa6..c149da18fa 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -27,12 +27,19 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
 MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
+MACHINE_EXTRA_RRECOMMENDS = "\
+    kernel-module-snd-h2200-audio \
+    kernel-module-i2c-pxa \
+    "
+
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 
 #
 # Modules autoload and other boot properties
 #
 module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-h2000-audio = "snd-h2000-audio"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 9cf8272b51..1fcaf664d4 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -27,32 +27,11 @@ PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
+MACHINE_EXTRA_RRECOMMENDS = "\
                              kernel-module-micro"
 
 EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
-
-
-# TODO: see if any of these modules have 2.6 counterparts
-# and need to be RRECOMMENDED
-#
-#H3600_MODULES = "\
-#h3600-asic \
-#hwtimer \
-#nvrd \
-#sa1100-cs \
-#sa1100-ir \
-#sa1100-wdt \
-#sa1100-audio \
-#sa1100-rtc \
-#sa1100usb-core \
-#sd-mod \
-#serial-h3800 \
-#"
-
-
-
 #
 # Modules autoload and other boot properties
 #
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index f56bee00e8..0683498c5f 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -26,8 +26,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
-                             kernel-module-h4000-pcmcia \
                              kernel-module-i2c-pxa \
+			     kernel-module-h4000-bt \
+                             kernel-module-h4000-pcmcia \
                              kernel-module-acx \
                             "
 
@@ -36,7 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
 #
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-h4000_audio = "snd-h4000_audio"
+module_autoload_snd-h4000-audio = "snd-h4000-audio"
 module_autoload_g_ether = "g_ether"
 module_conf_acx = "blacklist acx"
 
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index c3e7cf710e..b7b9b5cdc0 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -28,11 +28,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls-cp437 \
-                                kernel-module-nls-iso8859-1 \
-                                kernel-module-nls-utf8 \
-                                kernel-module-af-key \
-				kernel-module-bsd-comp \
+MACHINE_EXTRA_RRECOMMENDS = "\
 				kernel-module-i2c-pxa \
 				kernel-module-snd-htcuniversal-audio \
 				kernel-module-htcuniversal-acx \
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 87e03a7bdd..daa74866b2 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -34,10 +34,7 @@ XSERVER = "xserver-kdrive-w100"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
-				kernel-module-nls-iso8859-1 \
-				kernel-module-nls-utf8 \
-				kernel-module-af-key \
+MACHINE_EXTRA_RRECOMMENDS = "\
 				kernel-module-i2c-pxa \
 				kernel-module-pxa27x-voltage \
 				kernel-module-pxa27x-voltage-max158xx \
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index 175ec80e6a..6e7d303586 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -2,13 +2,24 @@
 #@NAME: ixp4xx
 #@DESCRIPTION: genric machine configuration for ixp4xx platforms
 
-MACHINE_FEATURES = "kernel26 usbhost ext2"
+# Set default for common ixp4xx-based machines
+MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex"
 
+# Select an appropriate default kernel
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
+
+# Add packages required for basic networking support
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
+
+# Set default for 16MB machines - can be overridden for more or less flash.
 ROOT_FLASH_SIZE ?= "12"
 
-EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
+# Allow for rootfs loaded direct from internal hard disk
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
+# Set default for common ixp4xx-based machines
+EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-xscale.inc
 require conf/machine/include/tune-thumb.inc
diff --git a/conf/machine/include/tune-geodelx.conf b/conf/machine/include/tune-geodelx.inc
index 335fadec6e..335fadec6e 100644
--- a/conf/machine/include/tune-geodelx.conf
+++ b/conf/machine/include/tune-geodelx.inc
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 8f48c614d1..7e41da0783 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -55,7 +55,7 @@ zaurus_make_installkit () {
         cp gnu-tar ${IMAGE_NAME}-installkit/
         cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
     else
-        cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+        [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
     fi
 
     # All zaurus machines except collie need updater.sh
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 900b24b751..e099825a40 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -41,7 +41,6 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 MACHINE_EXTRA_RRECOMMENDS = " \
-	kernel-module-af-key \
 	kernel-module-i2c-pxa \
 	kernel-module-pxa27x-voltage \
 	kernel-module-pxa27x-voltage-max158xx \
diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index f32f78ee8a..81c3e29e91 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -10,8 +10,12 @@ PREFERRED_VERSION_u-boot = "git"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
+PREFERRED_VERSION_u-boot = "1.3.0"
 UBOOT_MACHINE = "MPC8313ERDB_33_config"
 
+#rootfs on NAND flash
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers"
+
 #don't try to access tty1
 USE_VT = "0"
 
diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf
index a6b29552c5..ee2c6144a9 100644
--- a/conf/machine/mpc8323e-rdb.conf
+++ b/conf/machine/mpc8323e-rdb.conf
@@ -3,14 +3,14 @@
 #@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB
 
 TARGET_ARCH = "powerpc"
-TARGET_FPU = "soft"
+TARGET_FPU ?= "soft"
 PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c2"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2"
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
 
-PREFERRED_VERSION_u-boot = "git"
+PREFERRED_VERSION_u-boot = "1.1.6"
 UBOOT_MACHINE = "MPC8323ERDB_config"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 3b527293df..ab3da912ba 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -2,7 +2,7 @@
 #@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD
 #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
 
-MACHINE_KERNEL_VERSION ?= "2.4"
+MACHINE_KERNEL_VERSION ?= "2.6"
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index d70db72f38..d8ea4b8890 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -6,9 +6,6 @@ require conf/machine/include/zaurus-2.6.inc
 
 IMAGE_FSTYPES ?= "jffs2"
 
-# newer kernels does not build
-PREFERRED_VERSION_linux-rp = "2.6.17"
-
 # wlan-ng Modules
 MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb"
 
diff --git a/conf/machine/vmware.conf b/conf/machine/vmware.conf
new file mode 100644
index 0000000000..4822c389a1
--- /dev/null
+++ b/conf/machine/vmware.conf
@@ -0,0 +1,25 @@
+# Copyright (C) 2007, Florian Boor - based on x86.conf:
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: VMWare
+#@DESCRIPTION: Machine configuration for a VMWare virtual PC
+
+TARGET_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS = "vmware"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER="xserver-kdrive-vesa"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen x86"
+
+udevdir = "/dev"
+OLDEST_KERNEL = "2.6.17"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+require conf/machine/include/pentiumpro.inc