Tests: Update tests to use DRA7XX platform instance

[ipc/ipcdev.git] / ipc-bios.bld

diff --git a/ipc-bios.bld b/ipc-bios.bld
index d691254552e1fd9355e0471fceb3f37af3c2e9f6..741196bcd7dcc24a2c338df823797888052c2fad 100644 (file)
--- a/ipc-bios.bld
+++ b/ipc-bios.bld
@@ -63,9 +63,6 @@
  *     Build       an alias for xdc.om.xdc.bld.BuildEnvironment
  */
 
-/* for M3-devices only (OMAP5), build using the SMP-enabled platform */
-var build_smp = "1";
-
 /* Common ccopts suffix used for all C6x targets */
 var c6xOpts = " -mi10 -mo -pdr -pden -pds=238 -pds=880 -pds1110 -g ";
 
@@ -108,10 +105,12 @@ var ccOpts = {
 };
 
 /* Enable building SMP-BIOS enabled libraries for targets that support it */
-xdc.module("ti.targets.arm.elf.M3").profiles["smp"] =
-        xdc.module("ti.targets.arm.elf.M3").profiles["debug"];
-xdc.module("ti.targets.arm.elf.M4").profiles["smp"] =
-        xdc.module("ti.targets.arm.elf.M4").profiles["debug"];
+if (Pkg.name.match(/^ti\.sdo\.(ipc|utils)/)) {
+    xdc.module("ti.targets.arm.elf.M3").profiles["smp"] =
+            xdc.module("ti.targets.arm.elf.M3").profiles["debug"];
+    xdc.module("ti.targets.arm.elf.M4").profiles["smp"] =
+            xdc.module("ti.targets.arm.elf.M4").profiles["debug"];
+}
 
 /* initialize local vars with those set in xdcpaths.mak (via XDCARGS) */
 for (arg = 0; arg < arguments.length; arg++) {
@@ -136,43 +135,38 @@ for (arg = 0; arg < arguments.length; arg++) {
         target.platforms = [ "ti.platforms.evmOMAPL138:DSP" ];
     }
 
-    if (targetName.match(/elf\.C66/)) {
-        target.lnkOpts.suffix += " -cr";
+    if (targetName.match(/elf\.C66$/)) {
+        target.lnkOpts.prefix += " -e=ti_sysbios_family_c64p_Hwi0";
+        target.lnkOpts.prefix += " --cinit_compression=off";
         target.platforms = [
             //"ti.platforms.simKepler"
             //"ti.platforms.evm6614:DSP"
-            "ti.platforms.evmTCI6638K2K"
+            "ti.platforms.evmTCI6638K2K",
+            "ti.platforms.evmDRA7XX:dsp1",
         ];
     }
 
     if (targetName.match(/elf\.C64T/)) {
         target.lnkOpts.prefix += " -e=ti_sysbios_family_c64p_Hwi0";
-        /* NOTE: These platforms (from omapzoom) are local, custom: */
+
         target.platforms = [
-                    //"ti.platform.omap4430.dsp",
-                    "ti.platform.omap54xx.dsp",
-                ];
+            "ti.platforms.sdp5430:DSP",
+        ];
     }
 
-    if (targetName.match(/elf\.M3/)) {
+    /*
+     * TODO: for now, continue to support OMAP5 for M3 targets until all users
+     * migrate to the new OMAP5-based M4 platform.  Eventually remove omap54xx
+     * from the M3 target.platforms[] array.
+     */
+    if (targetName.match(/elf\.M(3|4)$/)) {
         target.lnkOpts.prefix += " --retain=.resource_table";
         target.lnkOpts.prefix += " --cinit_compression=off";
-        /* NOTE: These platforms (from omapzoom) are local, custom: */
-        /* Set default platform and list of all interested platforms for M3 */
-        if (build_smp == null || build_smp == "0") {
-            /* Helps boot times, plus unmasks issues w/ uninit'd vars */
-            target.lnkOpts.prefix +=  " --zero_init=off";
-            target.platforms = [
-                        //"ti.platform.omap4430.core0",
-                        "ti.platform.omap54xx.core0",
-                   ];
-        }
-        else {
-            target.platforms =  [
-                        //"ti.platform.omap4430.ipu",
-                        "ti.platform.omap54xx.ipu",
-                   ];
-        }
+
+        target.platforms =  [
+            "ti.platforms.sdp5430:IPU",
+            "ti.platforms.evmDRA7XX:ipu2",
+        ];
     }
 
     Build.targets.$add(target);