Merge remote branch 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5

17 files changed, 45 insertions, 23 deletions

diff --git a/conf/machine/da830-omapl137-evm.conf b/conf/machine/da830-omapl137-evm.conf
index 4df4d63cca..0164e1c27d 100644
--- a/conf/machine/da830-omapl137-evm.conf
+++ b/conf/machine/da830-omapl137-evm.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI DA830/OMAPL137 EVM board
 
 require conf/machine/include/davinci.inc
+require conf/machine/include/omapl137.inc
 
 UBOOT_MACHINE = "da830_omapl137_evm_config"
 UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf
index bbcb45002e..b61c00ca27 100644
--- a/conf/machine/da850-omapl138-evm.conf
+++ b/conf/machine/da850-omapl138-evm.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI DA850/OMAPL138 EVM board
 
 require conf/machine/include/davinci.inc
+require conf/machine/include/omapl138.inc
 
 UBOOT_MACHINE = "da850_omapl138_evm_config"
 UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
index e3c0554f71..63fc2cacc4 100644
--- a/conf/machine/davinci-sffsdr.conf
+++ b/conf/machine/davinci-sffsdr.conf
@@ -28,4 +28,5 @@ MACHINE_FEATURES = "kernel26 serial"
 #MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
 
 require conf/machine/include/tune-arm926ejs.inc
+require conf/machine/include/dm6446.inc
 
diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf
index 73c9f1e017..a352b5e926 100644
--- a/conf/machine/dm355-evm.conf
+++ b/conf/machine/dm355-evm.conf
@@ -5,4 +5,4 @@
 require conf/machine/include/davinci.inc
 require conf/machine/include/dm355.inc
 
-UBOOT_MACHINE = "davinci_dm355evm_config"
+UBOOT_MACHINE = "davinci_dm355_evm_config"
diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf
index 7cea5dc727..1fd51234e2 100644
--- a/conf/machine/dm365-evm.conf
+++ b/conf/machine/dm365-evm.conf
@@ -3,5 +3,6 @@
 #@DESCRIPTION: Machine configuration for the TI Davinci DM365 EVM board
 
 require conf/machine/include/davinci.inc
+require conf/machine/include/dm365.inc
 
 UBOOT_MACHINE = "davinci_dm365evm_config"
diff --git a/conf/machine/dm6446-evm.conf b/conf/machine/dm6446-evm.conf
index 8b048a5474..aaa7492991 100644
--- a/conf/machine/dm6446-evm.conf
+++ b/conf/machine/dm6446-evm.conf
@@ -3,5 +3,6 @@
 #@DESCRIPTION: Machine configuration for the TI Davinci DM6446 EVM board
 
 require conf/machine/include/davinci.inc
+require conf/machine/include/dm6446.inc
 
 UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/hawkboard.conf b/conf/machine/hawkboard.conf
index 5a9df79ade..ccf571ef9f 100644
--- a/conf/machine/hawkboard.conf
+++ b/conf/machine/hawkboard.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI Hawkboard
 
 require conf/machine/include/davinci.inc
+require conf/machine/include/omapl138.conf
 
 UBOOT_MACHINE = "da850_omapl138_evm_config"
 UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index ceafa800b2..3f8254aff4 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r12"
+MACHINE_KERNEL_PR = "r28"
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/include/dm355.inc b/conf/machine/include/dm355.inc
index dffafe4460..d666d5e030 100644
--- a/conf/machine/include/dm355.inc
+++ b/conf/machine/include/dm355.inc
@@ -1,9 +1,2 @@
-
-DEVICES       = "DM355"
-GPPOS         = "LINUX_GCC"
-PLATFORM      = "dm355"
-PROGRAMS      = "APP_LOCAL"
-TARGET        = "dm355_al"
-XDC_PLATFORM  = ti.platforms.evmDM355
-
+SOC_FAMILY = "dm355"
 
diff --git a/conf/machine/include/dm365.inc b/conf/machine/include/dm365.inc
new file mode 100644
index 0000000000..c53680ea63
--- /dev/null
+++ b/conf/machine/include/dm365.inc
@@ -0,0 +1,12 @@
+SOC_FAMILY = "dm365"
+
+
+# DMAI
+PLATFORM      = "dm365"
+XDC_PLATFORM  = ti.platforms.evmDM365
+
+# Obsoleted (CE examples rebuild)
+#GPPOS         = "LINUX_GCC"
+
+# DMAI recipe
+#TARGET        = "dm365_al"
diff --git a/conf/machine/include/dm6446.inc b/conf/machine/include/dm6446.inc
new file mode 100644
index 0000000000..c14e573c74
--- /dev/null
+++ b/conf/machine/include/dm6446.inc
@@ -0,0 +1,13 @@
+SOC_FAMILY = "dm6446"
+
+# TI DVSDK stuff:
+DSPCFG            ?= "DM6446GEMSHMEM"
+DSPLINKDSPCFG     ?= "DM6446GEMSHMEM"
+DSPLINKGPPOS      ?= "MVL5G"
+DSPLINKPLATFORM   ?= "DAVINCI"
+DSPLINKSOC        ?= "DM6446"
+DSPPOWERSOC       ?= "DM6446"
+GPPOS             ?= "LINUX_GCC"
+PLATFORM          ?= "dm6446"
+XDC_PLATFORM      ?= "ti.platforms.evmDM6446"
+
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 2f242a4b38..9ff7b91ad9 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,3 +1,5 @@
+SOC_FAMILY = "omap3"
+
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
@@ -12,17 +14,10 @@ UBOOT_LOADADDRESS = "0x80008000"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # TI DVSDK stuff:
-CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
-CODEC             ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
-DEVICES           ?= "OMAP3530"
-DSPCFG            ?= "OMAP3530SHMEM"
+# DSPLink rebuild
 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/omapl137.conf b/conf/machine/include/omapl137.conf
new file mode 100644
index 0000000000..34d0e9a754
--- /dev/null
+++ b/conf/machine/include/omapl137.conf
@@ -0,0 +1,2 @@
+SOC_FAMILY = "omapl137"
+
diff --git a/conf/machine/include/omapl138.conf b/conf/machine/include/omapl138.conf
new file mode 100644
index 0000000000..4c222753df
--- /dev/null
+++ b/conf/machine/include/omapl138.conf
@@ -0,0 +1 @@
+SOC_FAMILY = "omapl138"
diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc
index a7dd04f596..44058c12be 100644
--- a/conf/machine/include/tune-atom.inc
+++ b/conf/machine/include/tune-atom.inc
@@ -1,8 +1,9 @@
 # GCC 4.3.0- (see Poky)
 # TARGET_CC_ARCH = "-march=i586"
-#
 # GCC 4.3.1+ (see Gentoo)
 TARGET_CC_ARCH = "-march=core2"
-
 # GCC 4.4.2+ (see Fedora 12)
 #TARGET_CC_ARCH = "-march=i686 -mtune=atom"
+BASE_PACKAGE_ARCH = "i686"
+FEED_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
\ No newline at end of file
diff --git a/conf/machine/ion.conf b/conf/machine/ion.conf
index f58219bd1a..23b3cf7c37 100644
--- a/conf/machine/ion.conf
+++ b/conf/machine/ion.conf
@@ -8,8 +8,6 @@ TARGET_ARCH = "i686"
 
 #MACHINE_ARCH = "core2"
 
-PACKAGE_EXTRA_ARCHS = "x86"
-
 include conf/machine/include/tune-atom.inc
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
index b751cbcac2..9b552a462a 100644
--- a/conf/machine/neuros-osd2.conf
+++ b/conf/machine/neuros-osd2.conf
@@ -26,4 +26,5 @@ MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
 
 require conf/machine/include/tune-arm926ejs.inc
 require conf/machine/include/neuros.inc
+require conf/machine/include/dm6446.inc