dmai: remove xdc hack

diff --git a/packages/dsplink/dmai_1.20.bb b/packages/dsplink/dmai_1.20.bb
index 9a549c3..b6991a1 100644 (file)
--- a/packages/dsplink/dmai_1.20.bb
+++ b/packages/dsplink/dmai_1.20.bb
@@ -13,7 +13,6 @@ SRC_URI = "file://dmai_1_20_00_06.tar.gz \
           file://dmai-do-not-panic-on-mixer-failure.patch;patch=1 \
           file://dmai-support-32bit-align.patch;patch=1 \
           file://dmai-built-with-angstrom.patch;patch=1 \
-          file://dmai-unbreak-xdc-args.patch;patch=1 \
    "
 
 S = "${WORKDIR}/dmai_1_20_00_06"
@@ -25,11 +24,23 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 TARGET = "all"
 TARGET_neuros-osd2 = " dm6446_al dm6446_db"
 TARGET_beagleboard = " o3530_al"
+TARGET_omap3evm = " o3530_al"
 
 export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools"
 
+do_compile_prepend_omap3evm() {
+
+#temp removal of sources that fail to build
+       if [ -e packages/ti/sdo/dmai/linux/omap3530/Resize.c ]; then
+               rm packages/ti/sdo/dmai/linux/omap3530/Resize.c
+       fi
+
+        if [ -e packages/ti/sdo/dmai/linux/omap3530/Framecopy_accel.c ]; then
+                rm packages/ti/sdo/dmai/linux/omap3530/Framecopy_accel.c
+        fi
+}
+
 do_compile() {
-       sed -i -e s:SEDME_CCARCH:'${TARGET_CCARCH}': ${S}/packages/config.bld   
        cd packages/ti/sdo/dmai
        oe_runmake clean
        oe_runmake ${TARGET} C_FLAGS="-O2 -I${STAGING_INCDIR}"

diff --git a/packages/dsplink/files/dmai-unbreak-xdc-args.patch b/packages/dsplink/files/dmai-unbreak-xdc-args.patch
deleted file mode 100644 (file)
index b9858d0..0000000
--- a/packages/dsplink/files/dmai-unbreak-xdc-args.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /tmp/config.bld    2009-02-17 19:32:14.000000000 +0100
-+++ dmai_1_20_00_06/packages/config.bld        2009-02-17 19:33:03.000000000 +0100
-@@ -46,6 +46,10 @@
- GCArmv5T.platform = "ti.platforms.evm3530";
- GCArmv5T.rootDir = java.lang.System.getenv("CSTOOL_DIR");
- 
-+GCArmv5T.cc.$unseal("opts");
-+GCArmv5T.cc.opts = "SEDME_CCARCH";
-+GCArmv5T.cc.$seal("opts");
-+
- /*
-  *  ======== Build.targets ========
-  * list of targets (ISAs + compilers) to build for

diff --git a/packages/dsplink/ti-paths.inc b/packages/dsplink/ti-paths.inc
index 81803e8..d72b3b5 100644 (file)
--- a/packages/dsplink/ti-paths.inc
+++ b/packages/dsplink/ti-paths.inc
@@ -13,6 +13,10 @@ TIXDCTOOLSDIR ?= "${TITOOLSDIR}/xdctools_3_10_03"
 # Path under TITOOLSDIR where the dsp toolchain is unpacked
 TICGTOOLSDIR ?= "cg6x_6_0_16"
 
+# Path to codecs/servers package - this is taken from DVSDK 3.00.00.29
+# - This needs fixing to be x-platform (not just omap3)
+TICODECSDIR ?= "omap3530_dvsdk_combos_3_16"
+
 # export some more variable to point to external TI tools
 # information is duplicated between the js and make based tools
 export CE_INSTALL_DIR=${S}
@@ -27,6 +31,8 @@ export CSTOOL_PREFIX="${TARGET_PREFIX}"
 export CSTOOL_DIR="${CROSS_DIR}"
 export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}
 
+# used by dmai (and gstreamer_ti?)
+export CODEC_INSTALL_DIR=${TITOOLSDIR}/${TICODECSDIR}
 
 # This tells codec engine which targets to build
 DEVICES ?= "DM6446"