Tests: Update tests to use DRA7XX platform instance

Teach ti.ipc.tests to use instances of the
ti.platforms.evmDRA7XX platform rather than the IPC-specific
vayu platforms.  These IPC-specific platforms can now be removed,
although we'll save that for the 3.10 stream so we don't break
existing users of them.

Note the two subtle changes in ipc-bios.bld.  First, the
platform name should be 'ti.platforms.evmDRA7XX' (note the
plural 'platforms').  Second, the platform defined by XDC includes
an instance named "IPU2", so our locally defined instance name
cannot match that - so it's changed to lowercase 'ipu2'.  Going
forward, we should standardize on platform instances with
all lower-case names.

Signed-off-by: Chris Ring <cring@ti.com>

diff --git a/ipc-bios.bld b/ipc-bios.bld
index 545450c5df380251711084bca81592cd35c4706d..741196bcd7dcc24a2c338df823797888052c2fad 100644 (file)
--- a/ipc-bios.bld
+++ b/ipc-bios.bld
@@ -142,8 +142,7 @@ for (arg = 0; arg < arguments.length; arg++) {
             //"ti.platforms.simKepler"
             //"ti.platforms.evm6614:DSP"
             "ti.platforms.evmTCI6638K2K",
-            /* NOTE: This platform (from omapzoom) is local, custom: */
-            "ti.platform.evmDRA7XX:DSP1"
+            "ti.platforms.evmDRA7XX:dsp1",
         ];
     }
 
@@ -166,7 +165,7 @@ for (arg = 0; arg < arguments.length; arg++) {
 
         target.platforms =  [
             "ti.platforms.sdp5430:IPU",
-            "ti.platform.evmDRA7XX:IPU2",
+            "ti.platforms.evmDRA7XX:ipu2",
         ];
     }
 

diff --git a/packages/ti/ipc/tests/package.bld b/packages/ti/ipc/tests/package.bld
index 7598b72f92abb6d1161041a295a49c31aa2fca0e..d8a05d24f0d742b0644b4eea29067834294f07bb 100644 (file)
--- a/packages/ti/ipc/tests/package.bld
+++ b/packages/ti/ipc/tests/package.bld
@@ -211,6 +211,149 @@ Build.platformTable["ti.platforms.sdp5430:DSP"] = {
     stackMemory: "EXT_DATA",
 };
 
+/*  Memory Map for ti.platforms.evmDRA7XX:dsp1
+ *
+ *  --- External Memory ---
+ *  Virtual     Physical        Size            Comment
+ *  ------------------------------------------------------------------------
+ *  0000_4000   ????_????    5F_C000  (  ~6 MB) EXT_CODE
+ *  8000_0000   ????_????    60_0000  (   6 MB) EXT_DATA
+ *  8060_0000   ????_????   960_0000  (  86 MB) EXT_HEAP
+ *  9F00_0000   9F00_0000     6_0000  ( 384 kB) TRACE_BUF
+ *  9F06_0000   9F06_0000     1_0000  (  64 kB) EXC_DATA
+ *  9F07_0000   9F07_0000     2_0000  ( 128 kB) PM_DATA (Power mgmt)
+ */
+var evmDRA7XX_ExtMemMapDsp1 = {
+    EXT_CODE: {
+        name: "EXT_CODE",
+        base: 0x95000000,
+        len:  0x00100000,
+        space: "code",
+        access: "RWX"
+    },
+    EXT_DATA: {
+        name: "EXT_DATA",
+        base: 0x95100000,
+        len:  0x00100000,
+        space: "data",
+        access: "RW"
+    },
+    EXT_HEAP: {
+        name: "EXT_HEAP",
+        base: 0x95200000,
+        len:  0x00300000,
+        space: "data",
+        access: "RW"
+    },
+    TRACE_BUF: {
+        name: "TRACE_BUF",
+        base: 0x9F000000,
+        len:  0x00060000,
+        space: "data",
+        access: "RW"
+    },
+    EXC_DATA: {
+        name: "EXC_DATA",
+        base: 0x9F060000,
+        len:  0x00010000,
+        space: "data",
+        access: "RW"
+    },
+    PM_DATA: {
+        name: "PM_DATA",
+        base: 0x9F070000,
+        len:  0x00020000,
+        space: "data",
+        access: "RWX"  /* should this have execute perm? */
+    }
+};
+
+Build.platformTable["ti.platforms.evmDRA7XX:dsp1"] = {
+    externalMemoryMap: [
+        [ "EXT_CODE", evmDRA7XX_ExtMemMapDsp1.EXT_CODE ],
+        [ "EXT_DATA", evmDRA7XX_ExtMemMapDsp1.EXT_DATA ],
+        [ "EXT_HEAP", evmDRA7XX_ExtMemMapDsp1.EXT_HEAP ],
+        [ "TRACE_BUF", evmDRA7XX_ExtMemMapDsp1.TRACE_BUF ],
+        [ "EXC_DATA", evmDRA7XX_ExtMemMapDsp1.EXC_DATA ],
+        [ "PM_DATA", evmDRA7XX_ExtMemMapDsp1.PM_DATA ]
+    ],
+    codeMemory: "EXT_CODE",
+    dataMemory: "EXT_DATA",
+    stackMemory: "EXT_DATA",
+};
+
+
+/*  Memory Map for ti.platforms.evmDRA7XX:ipu2
+ *
+ *  --- External Memory ---
+ *  Virtual     Physical        Size            Comment
+ *  ------------------------------------------------------------------------
+ *  0000_4000   ????_????    5F_C000  (  ~6 MB) EXT_CODE
+ *  8000_0000   ????_????    60_0000  (   6 MB) EXT_DATA
+ *  8060_0000   ????_????   960_0000  (  86 MB) EXT_HEAP
+ *  9F00_0000   9F00_0000     6_0000  ( 384 kB) TRACE_BUF
+ *  9F06_0000   9F06_0000     1_0000  (  64 kB) EXC_DATA
+ *  9F07_0000   9F07_0000     2_0000  ( 128 kB) PM_DATA (Power mgmt)
+ */
+var evmDRA7XX_ExtMemMapIpu2 = {
+    EXT_CODE: {
+        name: "EXT_CODE",
+        base: 0x00004000,
+        len:  0x005FC000,
+        space: "code",
+        access: "RWX"
+    },
+    EXT_DATA: {
+        name: "EXT_DATA",
+        base: 0x80000000,
+        len:  0x00600000,
+        space: "data",
+        access: "RW"
+    },
+    EXT_HEAP: {
+        name: "EXT_HEAP",
+        base: 0x80600000,
+        len:  0x09600000,
+        space: "data",
+        access: "RW"
+    },
+    TRACE_BUF: {
+        name: "TRACE_BUF",
+        base: 0x9F000000,
+        len:  0x00060000,
+        space: "data",
+        access: "RW"
+    },
+    EXC_DATA: {
+        name: "EXC_DATA",
+        base: 0x9F060000,
+        len:  0x00010000,
+        space: "data",
+        access: "RW"
+    },
+    PM_DATA: {
+        name: "PM_DATA",
+        base: 0x9F070000,
+        len:  0x00020000,
+        space: "data",
+        access: "RWX"  /* should this have execute perm? */
+    }
+};
+
+Build.platformTable["ti.platforms.evmDRA7XX:ipu2"] = {
+    externalMemoryMap: [
+        [ "EXT_CODE", evmDRA7XX_ExtMemMapIpu2.EXT_CODE ],
+        [ "EXT_DATA", evmDRA7XX_ExtMemMapIpu2.EXT_DATA ],
+        [ "EXT_HEAP", evmDRA7XX_ExtMemMapIpu2.EXT_HEAP ],
+        [ "TRACE_BUF", evmDRA7XX_ExtMemMapIpu2.TRACE_BUF ],
+        [ "EXC_DATA", evmDRA7XX_ExtMemMapIpu2.EXC_DATA ],
+        [ "PM_DATA", evmDRA7XX_ExtMemMapIpu2.PM_DATA ]
+    ],
+    codeMemory: "EXT_CODE",
+    dataMemory: "EXT_DATA",
+    stackMemory: "EXT_DATA",
+};
+
 for (var i = 0; i < Build.targets.length; i++) {
     var targ = Build.targets[i];
 
@@ -233,6 +376,7 @@ for (var i = 0; i < Build.targets.length; i++) {
               (platform.match(/^ti\.platform\.omap54xx/)) ||
               (platform.match(/^ti\.platforms\.sdp5430/)) ||
               (platform.match(/^ti\.platform\.vayu/)) ||
+              (platform.match(/^ti\.platforms\.evmDRA7XX/)) ||
               (platform.match(/\.platforms\.evmOMAPL138/)))) {
              continue;
         }
@@ -247,6 +391,7 @@ for (var i = 0; i < Build.targets.length; i++) {
 
         /* Vayu and OMAP5 require MmRpc and therefore use RPMSG_NS_2_0 */
         if (platform.match(/^ti\.platform\.vayu/) ||
+                platform.match(/^ti\.platforms\.evmDRA7XX/) ||
                 platform.match(/^ti\.platform\.sdp5430$/)) {
             extraDefs = " -DRPMSG_NS_2_0";
         }
@@ -311,14 +456,16 @@ for (var i = 0; i < Build.targets.length; i++) {
             }).addObjects(test_omx_SRCS);
         }
 
-        if (platform.match(/^ti\.platform\.vayu\.ipu2/)) {
+        if (platform.match(/^ti\.platform\.vayu\.ipu2/) ||
+                platform.match(/^ti\.platforms\.evmDRA7XX:ipu2$/)) {
             Pkg.addExecutable(name + "/test_omx_ipu2_vayu", targ, platform, {
                 cfgScript: "test_omx_ipu_vayu",
                 defs: "-D IPU -D VAYU -DRPMSG_NS_2_0"
             }).addObjects(test_omx_SRCS);
         }
 
-        if (platform.match(/^ti\.platform\.vayu\.dsp1/)) {
+        if (platform.match(/^ti\.platform\.vayu\.dsp1/) ||
+                platform.match(/^ti\.platforms\.evmDRA7XX:dsp1$/)) {
             Pkg.addExecutable(name + "/test_omx_dsp1_vayu", targ, platform, {
                 cfgScript: "test_omx_dsp_vayu",
                 defs: "-D DSP -D VAYU -DRPMSG_NS_2_0"

diff --git a/packages/ti/ipc/tests/ping_rpmsg.cfg b/packages/ti/ipc/tests/ping_rpmsg.cfg
index f4980fdb25066f43800308630f333c0fa7d3014f..cc0ccbc0df65bb3b5b45817da9e566e23f4a6ac2 100644 (file)
--- a/packages/ti/ipc/tests/ping_rpmsg.cfg
+++ b/packages/ti/ipc/tests/ping_rpmsg.cfg
@@ -71,7 +71,9 @@ else if (Program.cpu.deviceName.match(/^OMAP5430$/) &&
     xdc.includeFile("ti/configs/omap54xx/Dsp.cfg");
     xdc.includeFile("ti/configs/omap54xx/DspAmmu.cfg");
 }
-else if (Program.platformName.match(/^ti\.platform\.vayu\.ipu2/)) {
+else if (Program.platformName.match(/^ti\.platform\.vayu\.ipu2/) ||
+        (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
+         Program.cpu.attrs.cpuCore.match(/^CM4$/))) {
     var Task          = xdc.useModule('ti.sysbios.knl.Task');
     var params = new Task.Params;
     params.instance.name = "ping";
@@ -88,7 +90,9 @@ else if (Program.platformName.match(/^ti\.platform\.vayu\.ipu2/)) {
     xdc.includeFile("ti/configs/vayu/Ipu2Smp.cfg");
     xdc.includeFile("ti/configs/vayu/IpuAmmu.cfg");
 }
-else if (Program.platformName.match(/^ti\.platform\.vayu\.dsp1/)) {
+else if (Program.platformName.match(/^ti\.platform\.vayu\.dsp1/) ||
+        (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
+         Program.cpu.attrs.cpuCore.match(/^6600$/))) {
     var Task          = xdc.useModule('ti.sysbios.knl.Task');
     var params = new Task.Params;
     params.instance.name = "ping";

diff --git a/packages/ti/ipc/tests/rpmsg_transport.cfg b/packages/ti/ipc/tests/rpmsg_transport.cfg
index 21c9a4fd2d965e60f93a0f22b2857308a4dfbd47..6809b3282b78a51c6f75d91a973855663eba38f0 100644 (file)
--- a/packages/ti/ipc/tests/rpmsg_transport.cfg
+++ b/packages/ti/ipc/tests/rpmsg_transport.cfg
@@ -95,7 +95,9 @@ else if (Program.cpu.deviceName.match(/^OMAP5430$/) &&
     xdc.includeFile("ti/configs/omap54xx/Dsp.cfg");
     xdc.includeFile("ti/configs/omap54xx/DspAmmu.cfg");
 }
-else if (Program.platformName.match(/^ti\.platform\.vayu\.ipu2/)) {
+else if ((Program.platformName.match(/^ti\.platform\.vayu\.ipu2/)) ||
+         (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
+          Program.cpu.attrs.cpuCore.match(/^CM4$/))) {
     /* This initializes the MessageQ Transport RPMSG stack:  */
     xdc.loadPackage('ti.ipc.ipcmgr');
     var BIOS        = xdc.useModule('ti.sysbios.BIOS');
@@ -124,7 +126,9 @@ else if (Program.platformName.match(/^ti\.platform\.vayu\.ipu2/)) {
     xdc.includeFile("ti/configs/vayu/Ipu2Smp.cfg");
     xdc.includeFile("ti/configs/vayu/IpuAmmu.cfg");
 }
-else if (Program.platformName.match(/^ti\.platform\.vayu\.dsp1/)) {
+else if (Program.platformName.match(/^ti\.platform\.vayu\.dsp1/) ||
+         (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
+          Program.cpu.attrs.cpuCore.match(/^6600$/))) {
     /* This initializes the MessageQ Transport RPMSG stack:  */
     xdc.loadPackage('ti.ipc.ipcmgr');
     var BIOS        = xdc.useModule('ti.sysbios.BIOS');