propagate from branch 'org.openembedded.dev' (head 7c2dfd8725acfc6de0286a17d58cccbfa6c141f8)

            to branch 'org.openembedded.dev.avr32' (head 6a2246abf3d894c89fc60280e99b73072b879e02)

18 files changed, 98 insertions, 24 deletions

diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index 29af29a3b8..3c50ef561b 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: Alix
-#@DESCRIPTION: Machine configuration for PC Engines Alix1c board
+#@DESCRIPTION: Machine.inciguration for PC Engines Alix1c board
 #
 # http://pcengines.ch/alix1c.htm
 
@@ -15,9 +15,9 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86"
 
-require conf/machine/include/tune-geodelx.conf
+require.inc/machine/include/tune-geodelx.inc
 
 IMAGE_FSTYPES += "tar.gz"
 
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index e8903a960a..f00938cc4e 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@Name: Atmel AT91SAM9260EK Development Platform
-#@DESCRIPTION: Machine configuration for the at91sam9260ek development board with a at91sam9260 processor
+#@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
@@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
+KERNEL_IMAGETYPE = "uImage"
+
 #don't try to access tty1
 USE_VT = "0"
 
@@ -17,4 +19,4 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
 SERIAL_CONSOLE = "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
-require conf/machine/include/tune-arm926ejs.conf
+require.inc/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index 489575cd2b..e59dacbc86 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@Name: Atmel AT91SAM9261EK Development Platform
-#@DESCRIPTION: Machine configuration for the at91sam9261ek development board with a at91sam9261 processor
+#@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
@@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
+KERNEL_IMAGETYPE = "uImage"
+
 #don't try to access tty1
 USE_VT = "0"
 
@@ -17,4 +19,4 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
 SERIAL_CONSOLE = "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
-require conf/machine/include/tune-arm926ejs.conf
+require.inc/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf
new file mode 100644
index 0000000000..bd6354a2e4
--- /dev/null
+++ b/conf/machine/bd-neon.conf
@@ -0,0 +1,56 @@
+#@TYPE: Machine
+#@NAME: Boundary Devices NEON
+#@DESCRIPTION: Machine.inciguration for the Boundary Devices NEON board
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require.inc/machine/include/tune-xscale.inc
+
+# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
+#require.inc/machine/include/tune-iwmmxt.inc
+
+ROOT_FLASH_SIZE = "60"
+VOLATILE_STORAGE_SIZE = "128"
+GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa usbgadget screen uboot"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-bd-neon-2.6"
+MODUTILS = "26"	
+XSERVER = "xserver-kdrive-fbdev"
+MACHINE_TASK_PROVIDER = "task-base"
+
+PREFERRED_VERSION_u-boot = "1.1.2"
+
+EXTRA_IMAGEDEPENDS =" mtd-utils"
+
+MACHINE_EXTRA_RDEPENDS = " mtd-utils"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-module-nls-cp437 \
+				kernel-module-nls-iso8859-1 \
+				kernel-module-nls-utf8 \
+				kernel-module-af-key \
+				kernel-module-i2c-pxa"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x40000 --pad=32243712; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+			  -e 128KiB -p"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_evdev = "evdev"
+module_autoload_mmc_block = "mmc_block"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+
+#module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf
index c712c3728e..2522897042 100644
--- a/conf/machine/cm-x270.conf
+++ b/conf/machine/cm-x270.conf
@@ -3,11 +3,12 @@
 #@DESCRIPTION: Machine configuration for Compulab cm-x270 computer module
 #OLDEST_KERNEL = "2.6.16"
 TARGET_ARCH = "arm"
-PREFERRED_VERSION_compulab-pxa270 = "2.6.22"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-PREFERRED_PROVIDER_virtual/kernel = "compulab-pxa270"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.23"
+
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
 require conf/machine/include/tune-xscale.inc
 
@@ -16,6 +17,13 @@ require conf/machine/include/tune-xscale.inc
 # the following line to your local.conf:
 #   CMX270_CONSOLE_SERIAL_PORT = "ttyS0"
 
+# NAND flash eraseblock size
+# most of the older cm-x270 modules are populated with NAND flash
+# that have 128KiB eraseblocks.  Recently, a user encounted
+# a device that has 16KiB eraseblocks.  The following define
+# can be overridden in local.conf if you have one of these devices.
+CMX270_NAND_ERASEBLOCK_SIZE ?= "0x20000"
+
 # the following is for the cm-x270 L module
 CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
 
@@ -31,16 +39,16 @@ SERIAL_CONSOLE ?= "38400 ${CMX270_CONSOLE_SERIAL_PORT}"
 ROOT_FLASH_SIZE ?= "32"
 
 # for NAND flash.
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad --no-cleanmarkers;\
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${CMX270_NAND_ERASEBLOCK_SIZE} --pad --no-cleanmarkers;\
 	sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-	-e 0x20000 -p; \
+	-e ${CMX270_NAND_ERASEBLOCK_SIZE} -p; \
 	cd ${DEPLOY_DIR_IMAGE}; \
 	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
 	ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
 	"
 
-MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa iwmmxt"
 
 # to program the compulab NAND flash, the following scheme is suggested.  Create
 # a small rootfs that can fit in NOR flash using the following config:
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 0750e4d646..69d5e66171 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -12,7 +12,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_TASK_PROVIDER = "task-base"
 
 require conf/machine/include/tune-c3.inc
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 99eb9f0832..ac85afc48c 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -44,3 +44,6 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
+
+# build YAFFS2
+IMAGE_FSTYPES =+ "yaffs2"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index 626e755b1f..f17451556f 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -17,7 +17,7 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen x86"
 
 #require conf/machine/include/tune-athlonmp.inc
 
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index 0ef522441b..53e088da1c 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -19,7 +19,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index 8ff87553ba..b8e73f3085 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -18,7 +18,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 979a6bd484..4bcd36e2ab 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -21,7 +21,8 @@ include conf/machine/include/tune-xscale.inc
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 8d6cd2d220..3ee97a447e 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa"
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa x86"
 ROOT_FLASH_SIZE = "64"
 GUI_MACHINE_CLASS = "bigscreen"
 
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index ffa7dad468..2a8c009b10 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -15,7 +15,7 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen x86"
 
 IMAGE_FSTYPES = "tar.gz"
 
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
index 2378a9990e..fe811ba54e 100644
--- a/conf/machine/qemux86.conf
+++ b/conf/machine/qemux86.conf
@@ -7,6 +7,8 @@ PACKAGE_EXTRA_ARCHS = "x86"
 
 require conf/machine/include/qemu.inc
 
+MACHINE_FEATURES += "x86"
+
 KERNEL_IMAGETYPE = "bzImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
index d73c80214c..92720043f2 100644
--- a/conf/machine/wrap.conf
+++ b/conf/machine/wrap.conf
@@ -22,7 +22,7 @@ USE_DEVFS = "0"
 IMAGE_FSTYPE ?= "tar.gz"
 
 # Things to include in the fs image
-MACHINE_FEATURES = "kernel26 pci ext2"
+MACHINE_FEATURES = "kernel26 pci ext2 x86"
 # The kernel and grub need to installed to boot from flash
 MACHINE_EXTRA_RDEPENDS = "kernel grub"
 
diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf
index ad5badf84a..e52454ed52 100644
--- a/conf/machine/x86-32-nocona.conf
+++ b/conf/machine/x86-32-nocona.conf
@@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 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 b4021a6496..bd96c387b6 100644
--- a/conf/machine/x86-prescott.conf
+++ b/conf/machine/x86-prescott.conf
@@ -16,7 +16,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 51757e950c..c35e7ad389 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -13,7 +13,7 @@ KERNEL_IMAGETYPE = "bzImage"
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen"
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen x86"
 
 udevdir = "/dev"
 OLDEST_KERNEL = "2.6.17"