OMAP5: Switch from custom DSP platforms to platform instances

Updated build scripts to use platform instances (currently of
ti.platforms.sdp5430) rather than the custom DSP platform
in ipcdev.

Remove ti.platform.omap54xx.dsp.

diff --git a/ipc-bios.bld b/ipc-bios.bld
index 1ed281d780a3b7e6b876c5a333a5e28b9821c2be..4b6e3d8ffa9d222a685fbe66eed8f596cc5b1765 100644 (file)
--- a/ipc-bios.bld
+++ b/ipc-bios.bld
@@ -151,7 +151,7 @@ for (arg = 0; arg < arguments.length; arg++) {
         target.lnkOpts.prefix += " -e=ti_sysbios_family_c64p_Hwi0";
 
         target.platforms = [
-            "ti.platform.omap54xx.dsp",
+            "ti.platforms.sdp5430:DSP",
         ];
     }
 

diff --git a/packages/ti/ipc/tests/package.bld b/packages/ti/ipc/tests/package.bld
index 632c2862d5a1c57816c1f94401ab44ffb1cd8a24..cee7f99bb9d1b536b5a6cd7eaf6a42f6e400e36b 100644 (file)
--- a/packages/ti/ipc/tests/package.bld
+++ b/packages/ti/ipc/tests/package.bld
@@ -81,7 +81,7 @@ Build.platformTable["ti.platforms.evmOMAPL138:DSP"] = {
  *  9F06_0000   9F06_0000     1_0000  (  64 kB) EXC_DATA
  *  9F07_0000   9F07_0000     2_0000  ( 128 kB) PM_DATA (Power mgmt)
  */
-var sdp5430_ExtMemMap = {
+var sdp5430_ExtMemMapIpu = {
     EXT_CODE: {
         name: "EXT_CODE",
         base: 0x00004000,
@@ -128,12 +128,83 @@ var sdp5430_ExtMemMap = {
 
 Build.platformTable["ti.platforms.sdp5430:IPU"] = {
     externalMemoryMap: [
-        [ "EXT_CODE", sdp5430_ExtMemMap.EXT_CODE ],
-        [ "EXT_DATA", sdp5430_ExtMemMap.EXT_DATA ],
-        [ "EXT_HEAP", sdp5430_ExtMemMap.EXT_HEAP ],
-        [ "TRACE_BUF", sdp5430_ExtMemMap.TRACE_BUF ],
-        [ "EXC_DATA", sdp5430_ExtMemMap.EXC_DATA ],
-        [ "PM_DATA", sdp5430_ExtMemMap.PM_DATA ]
+        [ "EXT_CODE", sdp5430_ExtMemMapIpu.EXT_CODE ],
+        [ "EXT_DATA", sdp5430_ExtMemMapIpu.EXT_DATA ],
+        [ "EXT_HEAP", sdp5430_ExtMemMapIpu.EXT_HEAP ],
+        [ "TRACE_BUF", sdp5430_ExtMemMapIpu.TRACE_BUF ],
+        [ "EXC_DATA", sdp5430_ExtMemMapIpu.EXC_DATA ],
+        [ "PM_DATA", sdp5430_ExtMemMapIpu.PM_DATA ]
+    ],
+    codeMemory: "EXT_CODE",
+    dataMemory: "EXT_DATA",
+    stackMemory: "EXT_DATA",
+};
+
+/*  Memory Map for ti.platforms.sdp5430:DSP
+ *
+ *  --- External Memory ---
+ *  Virtual     Physical        Size            Comment
+ *  ------------------------------------------------------------------------
+ *  2000_0000   ????_????    10_0000  (   1 MB) EXT_CODE
+ *  9000_0000   ????_????    10_0000  (   1 MB) EXT_DATA
+ *  9010_0000   ????_????    30_0000  (   3 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 sdp5430_ExtMemMapDsp = {
+    EXT_CODE: {
+        name: "EXT_CODE",
+        base: 0x20000000,
+        len:  0x00100000,
+        space: "code",
+        access: "RWX"
+    },
+    EXT_DATA: {
+        name: "EXT_DATA",
+        base: 0x90000000,
+        len:  0x00100000,
+        space: "data",
+        access: "RW"
+    },
+    EXT_HEAP: {
+        name: "EXT_HEAP",
+        base: 0x90100000,
+        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.sdp5430:DSP"] = {
+    externalMemoryMap: [
+        [ "EXT_CODE", sdp5430_ExtMemMapDsp.EXT_CODE ],
+        [ "EXT_DATA", sdp5430_ExtMemMapDsp.EXT_DATA ],
+        [ "EXT_HEAP", sdp5430_ExtMemMapDsp.EXT_HEAP ],
+        [ "TRACE_BUF", sdp5430_ExtMemMapDsp.TRACE_BUF ],
+        [ "EXC_DATA", sdp5430_ExtMemMapDsp.EXC_DATA ],
+        [ "PM_DATA", sdp5430_ExtMemMapDsp.PM_DATA ]
     ],
     codeMemory: "EXT_CODE",
     dataMemory: "EXT_DATA",
@@ -262,8 +333,8 @@ for (var i = 0; i < Build.targets.length; i++) {
                 }).addObjects(["nano_test.c"]);
         }
 
-        if (platform.match(/^ti\.platform\.omap54xx\.ipu/) ||
-                (platform.match(/^ti\.platforms\.sdp5430/))) {
+        if (platform.match(/^ti\.platforms\.sdp5430/) &&
+                (targ.isa == "v7M4")) {
             Pkg.addExecutable(name + "/test_omx_ipu_omap5", targ, platform, {
                 cfgScript: "test_omx_ipu_omap5",
                 defs: "-D IPU -D OMAP5xxx -DRPMSG_NS_2_0"
@@ -271,7 +342,8 @@ for (var i = 0; i < Build.targets.length; i++) {
                     "MxServer.c"]);
         }
 
-        if (platform.match(/^ti\.platform\.omap54xx\.dsp/)) {
+        if (platform.match(/^ti\.platforms\.sdp5430/) &&
+                (targ.isa == "64T")) {
             Pkg.addExecutable(name + "/test_omx_dsp_omap5", targ, platform, {
                 cfgScript: "test_omx_dsp_omap5",
                 defs: "-D DSP -D OMAP5xxx -DRPMSG_NS_2_0"

diff --git a/packages/ti/ipc/tests/ping_rpmsg.cfg b/packages/ti/ipc/tests/ping_rpmsg.cfg
index f8428764c25f7b7f085484ade169732c314d2968..f4980fdb25066f43800308630f333c0fa7d3014f 100644 (file)
--- a/packages/ti/ipc/tests/ping_rpmsg.cfg
+++ b/packages/ti/ipc/tests/ping_rpmsg.cfg
@@ -31,6 +31,7 @@
  */
 
 //print ("Program.cpu.deviceName = " + Program.cpu.deviceName);
+//print ("Program.cpu.attrs.cpuCore = " + Program.cpu.attrs.cpuCore);
 //print ("Program.platformName = " + Program.platformName);
 
 /* This will match for omap5 IPU only: */
@@ -53,7 +54,8 @@ if (Program.cpu.deviceName.match(/^OMAP5430$/) &&
     xdc.includeFile("ti/configs/omap54xx/IpuAmmu.cfg");
 }
 /* This will match for omap5 dsp only: */
-else if (Program.platformName.match(/^ti\.platform\.omap54xx\.dsp/)) {
+else if (Program.cpu.deviceName.match(/^OMAP5430$/) &&
+        Program.cpu.attrs.cpuCore.match(/^64T$/)) {
     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 30ef065dec4daef7cdfd24222965269e2c021905..21c9a4fd2d965e60f93a0f22b2857308a4dfbd47 100644 (file)
--- a/packages/ti/ipc/tests/rpmsg_transport.cfg
+++ b/packages/ti/ipc/tests/rpmsg_transport.cfg
@@ -66,7 +66,8 @@ if (Program.cpu.deviceName.match(/^OMAP5430$/) &&
     xdc.includeFile("ti/configs/omap54xx/IpuAmmu.cfg");
 }
 /* This will match for omap5 dsp only: */
-else if (Program.platformName.match(/^ti\.platform\.omap54xx\.dsp/)) {
+else if (Program.cpu.deviceName.match(/^OMAP5430$/) &&
+        Program.cpu.attrs.cpuCore.match(/^64T$/)) {
     /* This initializes the MessageQ Transport RPMSG stack:  */
     xdc.loadPackage('ti.ipc.ipcmgr');
     var BIOS        = xdc.useModule('ti.sysbios.BIOS');

diff --git a/packages/ti/platform/omap54xx/dsp/Platform.xdc b/packages/ti/platform/omap54xx/dsp/Platform.xdc
deleted file mode 100644 (file)
index 4c66503..0000000
--- a/packages/ti/platform/omap54xx/dsp/Platform.xdc
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2012-2013, Texas Instruments Incorporated
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * *  Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * *  Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * *  Neither the name of Texas Instruments Incorporated nor the names of
- *    its contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*!
- * File generated by platform wizard.
- *
- */
-
-metaonly module Platform inherits xdc.platform.IPlatform {
-
-    config ti.platforms.generic.Platform.Instance plat =
-        ti.platforms.generic.Platform.create("plat", {
-            clockRate:      466,
-            catalogName:    "ti.catalog.c6000",
-            deviceName:     "OMAP5430",
-            externalMemoryMap: [
-                ["EXT_CODE",  {name: "EXT_CODE",  base: 0x20000000, len: 0x00100000, space: "code", access: "RWX"}],
-                ["EXT_DATA",  {name: "EXT_DATA",  base: 0x90000000, len: 0x00100000, space: "data", access: "RW"}],
-                ["EXT_HEAP",  {name: "EXT_HEAP",  base: 0x90100000, 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"}],
-            ],
-    });
-
-instance :
-
-    override config string codeMemory = "EXT_CODE";
-    override config string dataMemory = "EXT_DATA";
-    override config string stackMemory = "EXT_DATA";
-}

diff --git a/packages/ti/platform/omap54xx/dsp/Platform.xs b/packages/ti/platform/omap54xx/dsp/Platform.xs
deleted file mode 100644 (file)
index 18b7b1b..0000000
--- a/packages/ti/platform/omap54xx/dsp/Platform.xs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2012-2013, Texas Instruments Incorporated
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * *  Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * *  Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * *  Neither the name of Texas Instruments Incorporated nor the names of
- *    its contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*!
- * File generated by platform wizard.
- *
- */
-
-function getCpuDataSheet(cpuId)
-{
-    return this.$module.plat.getCpuDataSheet(cpuId);
-}
-
-function getCreateArgs()
-{
-    return this.$module.plat.getCreateArgs();
-}
-
-function getExeContext(prog)
-{
-    return this.$module.plat.getExeContext(prog);
-}
-
-function getExecCmd(prog)
-{
-    return this.$module.plat.getExecCmd(prog);
-}
-
-function getLinkTemplate(prog)
-{
-    return this.$module.plat.getLinkTemplate(prog);
-}

diff --git a/packages/ti/platform/omap54xx/dsp/package.bld b/packages/ti/platform/omap54xx/dsp/package.bld
deleted file mode 100644 (file)
index f6f6754..0000000
--- a/packages/ti/platform/omap54xx/dsp/package.bld
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012-2013, Texas Instruments Incorporated
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * *  Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * *  Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * *  Neither the name of Texas Instruments Incorporated nor the names of
- *    its contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*!
- * File generated by platform wizard.
- *
- */
-
-Pkg.attrs.exportAll = true;

diff --git a/packages/ti/platform/omap54xx/dsp/package.xdc b/packages/ti/platform/omap54xx/dsp/package.xdc
deleted file mode 100644 (file)
index f82d78a..0000000
--- a/packages/ti/platform/omap54xx/dsp/package.xdc
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2012-2013, Texas Instruments Incorporated
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * *  Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * *  Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * *  Neither the name of Texas Instruments Incorporated nor the names of
- *    its contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*!
- * File generated by platform wizard.
- *
- */
-
-package ti.platform.omap54xx.dsp {
-    module Platform;
-}