merge of '08199c52a592fe71e2675200cf618a439d710884'

     and '3e5f187370604cf4577025ebc49d90ca52a72d4d'

15 files changed, 85 insertions, 12 deletions

diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 824ab2b7b3..d1e19aa3e4 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -13,12 +13,13 @@ GUI_MACHINE_CLASS = "bigscreen"
 #Ship all kernel modules till the board support has matured enough
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-include conf/machine/include/tune-arm1136jf-s.inc
+#include conf/machine/include/tune-arm1136jf-s.inc
 # requires gcc 4.3.0:
-#include conf/machine/include/tune-cortexa8.inc
+include conf/machine/include/tune-cortexa8.inc
 
 
-IMAGE_FSTYPES ?= "tar.bz2"
+IMAGE_FSTYPES += "tar.bz2 jffs2"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 # Guesswork
 SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf
index e2ed11f79c..ba7a099825 100644
--- a/conf/machine/davinci-dvevm.conf
+++ b/conf/machine/davinci-dvevm.conf
@@ -22,5 +22,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
 
+MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
+
 require conf/machine/include/tune-arm926ejs.inc
 
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
index e732957d5d..1977da8104 100644
--- a/conf/machine/davinci-sffsdr.conf
+++ b/conf/machine/davinci-sffsdr.conf
@@ -25,5 +25,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 MACHINE_FEATURES = "kernel26 serial"
 
+MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
+
 require conf/machine/include/tune-arm926ejs.inc
 
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index 19c74fb301..5bf42da797 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc603e"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-rt"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 alsa"
 
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 0d3a9bbcf0..785214409f 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -8,6 +8,8 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
+IMAGE_FSTYPES += "jffs2"
+
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.inc
 
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index a9945acd34..52c2b04690 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -2,7 +2,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ezx"
 
 #cat /proc/mtd
 #dev:    size   erasesize  name
@@ -14,12 +14,13 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen phone"
 MACHINE_FEATURES += " iwmmxt"
 
-
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "180"
 
+XSERVER = "xserver-kdrive-fbdev"
+
 ROOT_FLASH_SIZE = "24"
 
 IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc
index f886366f10..51f6f3d72b 100644
--- a/conf/machine/include/tune-cortexa8.inc
+++ b/conf/machine/include/tune-cortexa8.inc
@@ -3,6 +3,6 @@
 # [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html 
 # [3] https://support.codesourcery.com/GNUToolchain/kbentry29
 
-TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp"
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
 FEED_ARCH = "armv7a"
 PACKAGE_ARCH = "armv7a"
diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
index fbefe5bd89..008d63daa8 100644
--- a/conf/machine/include/tune-pentium.inc
+++ b/conf/machine/include/tune-pentium.inc
@@ -1,4 +1,4 @@
-TARGET_CC_ARCH = "-mcpu=pentium"
+TARGET_CC_ARCH = "-march=pentium"
 PACKAGE_ARCH = "i586"
 FEED_ARCH = "i586"
 
diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc
index 6b110cc0b6..3406bb0c71 100644
--- a/conf/machine/include/tune-pentiumpro.inc
+++ b/conf/machine/include/tune-pentiumpro.inc
@@ -1,4 +1,4 @@
-TARGET_CC_ARCH = "-mcpu=pentiumpro"
+TARGET_CC_ARCH = "-march=pentiumpro"
 PACKAGE_ARCH = "i686"
 FEED_ARCH = "i686"
 
diff --git a/conf/machine/neuros-osd.conf b/conf/machine/neuros-osd.conf
index f88379aa2a..09a71535c6 100644
--- a/conf/machine/neuros-osd.conf
+++ b/conf/machine/neuros-osd.conf
@@ -9,6 +9,11 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
 
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
 PREFERRED_VERSION_u-boot = "git"
 #UBOOT_MACHINE = "davinci_dvevm_config"
 
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
new file mode 100644
index 0000000000..4a540270f4
--- /dev/null
+++ b/conf/machine/neuros-osd2.conf
@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: neuros OSD2
+#@DESCRIPTION: neuros OSD2
+
+TARGET_ARCH = "arm"
+
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+PREFERRED_VERSION_u-boot = "git"
+#UBOOT_MACHINE = "davinci_dvevm_config"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
+
+require conf/machine/include/tune-arm926ejs.inc
+
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 09c382f376..190d1d1049 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -8,7 +8,7 @@ TARGET_ARCH = "arm"
 MACHINE_CLASS = "neo1973"
 PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 ${MACHINE_CLASS}"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 3b9ed1b468..45dc0518a4 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -8,7 +8,7 @@ TARGET_ARCH = "arm"
 MACHINE_CLASS = "neo1973"
 PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
 UBOOT_ENTRYPOINT = "30008000"
 
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
new file mode 100644
index 0000000000..416db2c937
--- /dev/null
+++ b/conf/machine/omap3evm.conf
@@ -0,0 +1,32 @@
+#@TYPE: Machine
+#@NAME: omap3 EVM
+#@DESCRIPTION: Machine configuration for the TI omap3 EVM
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+GUI_MACHINE_CLASS = "smallscreen"
+
+#include conf/machine/include/tune-arm1136jf-s.inc
+# requires gcc 4.3.0:
+include conf/machine/include/tune-cortexa8.inc
+
+# Ship all kernel modules
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
+IMAGE_FSTYPES ?= "jffs2 tar.bz2"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"
+
diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf
index 9b51b87a7f..219d1f301e 100644
--- a/conf/machine/xilinx-ml403.conf
+++ b/conf/machine/xilinx-ml403.conf
@@ -7,7 +7,7 @@
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc405"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-ml403-slab-2.6.x"
+PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-slab"
 
 MACHINE_FEATURES = "kernel26 ext2"