From: Koen Kooi <koen@openembedded.org>
Date: Fri, 1 Oct 2010 12:49:51 +0000 (+0200)
Subject: ti recipes: fix omapl13x overrides
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1678d0854dbbacb142b3ba28630e1c7428ac5008;p=openembedded.git

ti recipes: fix omapl13x overrides
---

diff --git a/recipes/ti/gstreamer-ti.inc b/recipes/ti/gstreamer-ti.inc
index 12da1331f8..e18816c387 100644
--- a/recipes/ti/gstreamer-ti.inc
+++ b/recipes/ti/gstreamer-ti.inc
@@ -20,7 +20,7 @@ PR = "r75+${MACHINE_KERNEL_PR}"
 DEPENDS = "ti-dmai gstreamer gst-plugins-base"
 
 # enable c6accel elements on omapl138
-DEPENDS_append_da850-omapl138-evm = " ti-c6accel "
+DEPENDS_append_omapl138 = " ti-c6accel "
 EXTRA_OECONF_omapl138 = "--enable-c6accel"
 export C6ACCEL_INSTALL_DIR
 
diff --git a/recipes/ti/matrix-gui-e.inc b/recipes/ti/matrix-gui-e.inc
index 3004a657a6..0d0b4bf803 100644
--- a/recipes/ti/matrix-gui-e.inc
+++ b/recipes/ti/matrix-gui-e.inc
@@ -22,7 +22,7 @@ INITSCRIPT_NAME = "matrix-gui-e"
 INITSCRIPT_PARAMS = "defaults 99"
 #INITSCRIPT_PARAMS = "start 99 3 . stop 99 3 ."
 
-CXXFLAGS_da850-omapl138-evm_append = " -DPlatform_omapl138 "
+CXXFLAGS_omapl138_append = " -DPlatform_omapl138 "
 CXXFLAGS_dm365_append = " -DPlatform_dm365 "
 PACKAGE_ARCH = ${MACHINE_ARCH}
 
diff --git a/recipes/ti/matrix-gui.inc b/recipes/ti/matrix-gui.inc
index afdd96a349..871240fdf9 100644
--- a/recipes/ti/matrix-gui.inc
+++ b/recipes/ti/matrix-gui.inc
@@ -18,7 +18,7 @@ SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=ano
 
 S = "${WORKDIR}/trunk"
 
-CXXFLAGS_da850-omapl138-evm_append = " -DPlatform_omapl138 "
+CXXFLAGS_omapl138_append = " -DPlatform_omapl138 "
 CXXFLAGS_dm365_append = " -DPlatform_dm365 "
 PACKAGE_ARCH = ${MACHINE_ARCH}
 
diff --git a/recipes/ti/ti-audio-soc-example.inc b/recipes/ti/ti-audio-soc-example.inc
index 65566adbc5..a3942ccbcc 100644
--- a/recipes/ti/ti-audio-soc-example.inc
+++ b/recipes/ti/ti-audio-soc-example.inc
@@ -6,7 +6,7 @@ LICENSE = "TI BSD"
 require ti-paths.inc
 require ti-staging.inc
 
-COMPATIBLE_MACHINE = "(da830-omapl137-evm|da850-omapl138-evm)"
+COMPATIBLE_MACHINE = "(omapl137|omapl138)"
 
 PR = "r5"
 
@@ -17,11 +17,11 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/apps_processors/Audio_s
 DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-biospsp ti-edma3lld ti-dsplink"
 DEPENDS += "virtual/kernel"
 
-PLATFORM_da830-omapl137-evm = "omapl137" 
-PLATFORM_da850-omapl138-evm = "omapl138" 
+PLATFORM_omapl137 = "omapl137" 
+PLATFORM_omapl138= "omapl138" 
  
-BOARD_da830-omapl137-evm =  "evmOMAPL137"
-BOARD_da850-omapl138-evm =  "evmOMAPL138"
+BOARD_omapl137 =  "evmOMAPL137"
+BOARD_omapl138 =  "evmOMAPL138"
  
 do_compile() {
     # Build gpp sample application
diff --git a/recipes/ti/ti-biospsp.inc b/recipes/ti/ti-biospsp.inc
index 6aac89de62..ea5126491a 100644
--- a/recipes/ti/ti-biospsp.inc
+++ b/recipes/ti/ti-biospsp.inc
@@ -6,9 +6,9 @@ LICENSE = "TI BSD"
 require ti-paths.inc
 require ti-staging.inc
 
-COMPATIBLE_MACHINE = "(da830-omapl137-evm|da850-omapl138-evm)"
+COMPATIBLE_MACHINE = "(omapl137|omapl138)"
 
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/pspdrivers_${PV}"
 
diff --git a/recipes/ti/ti-dmai_2.20.00.04.bb b/recipes/ti/ti-dmai_2.20.00.04.bb
index 5887ff116d..1629cf89f9 100644
--- a/recipes/ti/ti-dmai_2.20.00.04.bb
+++ b/recipes/ti/ti-dmai_2.20.00.04.bb
@@ -1,9 +1,9 @@
 require ti-dmai.inc
 
 PV = "2_20_00_04"
-PR = "r3"
+PR = "r4"
  
-COMPATIBLE_MACHINE = "(da850-omapl138-evm|da830-omapl137-evm)"
+COMPATIBLE_MACHINE = "(omapl138|omapl137)"
 SRCREV         = "500"
 DMAIBRANCH     = "tags/TAG_2_20_00_04"