Merge branch 'org.openembedded.dev' of /home/dp/openembedded/org.openembedded.dev into xora/angstrom-srcpv

Conflicts:
	recipes/clutter/clutter-0.9_git.bb
	recipes/clutter/clutter-gst-0.9_git.bb
	recipes/efl1/edje_svn.bb
	recipes/efl1/embryo_svn.bb
	recipes/efl1/emotion_svn.bb
	recipes/freesmartphone/cornucopia.inc
	recipes/freesmartphone/dbus-hlid_git.bb
	recipes/freesmartphone/frameworkd-devel_git.bb
	recipes/freesmartphone/frameworkd_git.bb
	recipes/freesmartphone/fso-abyss_git.bb
	recipes/freesmartphone/fso-monitord_git.bb
	recipes/freesmartphone/fso-sounds.bb
	recipes/freesmartphone/fsod_git.bb
	recipes/freesmartphone/libframeworkd-glib_git.bb
	recipes/freesmartphone/libgsm0710mux_git.bb
	recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb
	recipes/linux/linux-davinci_git.bb
	recipes/opencv/opencv-samples_svn.bb
	recipes/opencv/opencv_svn.bb
	recipes/u-boot/u-boot_git.bb
	recipes/uclibc/uclibc_git.bb
	recipes/uclibc/uclibc_nptl.bb
	recipes/wmiconfig/wmiconfig_svn.bb

7 files changed, 22 insertions, 19 deletions

diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf
index f8a5c951b7..efcf10484a 100644
--- a/conf/machine/em-x270.conf
+++ b/conf/machine/em-x270.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
 PACKAGE_EXTRA_ARCHS = "iwmmxt "
-PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 #require conf/machine/include/tune-xscale.inc
@@ -43,7 +43,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth wifi usbhost usbgadg
 #
 
 #PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_VERSION_em-x270 = "2.6.23"
+PREFERRED_VERSION_linux = "2.6.23"
 MODUTILS = "26"	
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 9c3c8f59e1..6fb5905cc2 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r40" 
+MACHINE_KERNEL_PR = "r41" 
 
 KERNEL_IMAGETYPE = "uImage"
 
@@ -14,17 +14,17 @@ EXTRA_IMAGEDEPENDS += "u-boot"
 MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 
 # TI DVSDK stuff:
-CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
-CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
-DSPCFG ?= "OMAP3530SHMEM"
-DSPLINKDSPCFG ?= "OMAP3530SHMEM"
-DSPLINKGPPOS ?= "OMAPLSP"
-GPPOS ?= "OMAPLSP"
-DSPLINKPLATFORM ?= "OMAP3530"
-DSPLINKSOC ?= "3530"
-DSPPOWERSOC ?= "omap3530"
-LPMDSPPOWERSOC ?= "omap3530"
-PLATFORM ?= "omap3530"
-TARGET ?= "o3530_al"
-XDC_PLATFORM ?= ti.platforms.evm3530
+CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
+CODEC             ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
+DEVICES           ?= "OMAP3530"
+DSPCFG            ?= "OMAP3530SHMEM"
+DSPLINKDSPCFG     ?= "OMAP3530SHMEM"
+DSPLINKGPPOS      ?= "OMAPLSP"
+DSPLINKPLATFORM   ?= "OMAP3530"
+DSPLINKSOC        ?= "3530"
+DSPPOWERSOC       ?= "omap3530"
+GPPOS             ?= "LINUX_GCC"
+LPMDSPPOWERSOC    ?= "omap3530"
+PLATFORM          ?= "omap3530"
+XDC_PLATFORM      ?= "ti.platforms.evm3530"
 
diff --git a/conf/machine/include/tune-sh3.inc b/conf/machine/include/tune-sh3.inc
index 65bfacf174..32801a61c3 100644
--- a/conf/machine/include/tune-sh3.inc
+++ b/conf/machine/include/tune-sh3.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-ml -m3"
 FEED_ARCH = "sh3"
+BASE_PACKAGE_ARCH = "sh3"
diff --git a/conf/machine/include/tune-sh4.inc b/conf/machine/include/tune-sh4.inc
index c20b8cf5a0..5d43e4195e 100644
--- a/conf/machine/include/tune-sh4.inc
+++ b/conf/machine/include/tune-sh4.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-ml -m4"
 FEED_ARCH = "sh4"
+BASE_PACKAGE_ARCH = "sh4"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 8780b827f5..ad410fae4c 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -23,7 +23,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-omap-pm"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
 
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "omap3_evm_config"
diff --git a/conf/machine/vortex86sx.conf b/conf/machine/vortex86sx.conf
index b2a116d109..68a62cc4dc 100644
--- a/conf/machine/vortex86sx.conf
+++ b/conf/machine/vortex86sx.conf
@@ -3,7 +3,7 @@
 
 require conf/machine/include/tune-i486sx.inc
 
-MACHINE_FEATURES += "x86"
+MACHINE_FEATURES = "kernel26 alsa vfat screen usbhost x86"
 
 KERNEL_IMAGETYPE = "bzImage"
 
diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf
index eb2ddcff69..b87a368778 100644
--- a/conf/machine/xilinx-ml403.conf
+++ b/conf/machine/xilinx-ml403.conf
@@ -6,7 +6,8 @@
 
 TARGET_ARCH = "powerpc"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-slab"
+ASSUME_PROVIDED += "virtual/kernel"
+#PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-slab"
 
 MACHINE_FEATURES = "kernel26 ext2"