OMAP5: Update ti.platforms.omap54xx.* to correct deviceName and M4 ISA

The OMAP5 platforms were incorrectly using the OMAP4430 device name and M3
ISA for the IPU.  Update them to correctly support OMAP5430 and M4.

Add OMAP5430 device support to IPC, and update config scripts to use
appropriate MulticProc names for OMAP5.

diff --git a/ipc-bios.bld b/ipc-bios.bld
index 2e2daa19efcae5ab3f3b9d0065079d52fb2f5bc8..6f526c7b866be2ac36b25857a9f37a406c18daf9 100644 (file)
--- a/ipc-bios.bld
+++ b/ipc-bios.bld
@@ -150,7 +150,12 @@ for (arg = 0; arg < arguments.length; arg++) {
         ];
     }
 
-    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";
 

diff --git a/packages/ti/configs/omap54xx/IpuSmp.cfg b/packages/ti/configs/omap54xx/IpuSmp.cfg
index 0771e30e4ea552599d315112bd595a3be8840251..478a08aeae7e795771374f755baa8b9bcfb4a7f1 100644 (file)
--- a/packages/ti/configs/omap54xx/IpuSmp.cfg
+++ b/packages/ti/configs/omap54xx/IpuSmp.cfg
@@ -36,7 +36,7 @@ BIOS.smpEnabled = true;
 
 /* -------------------------------- CORE0 ----------------------------------*/
 var MultiProc = xdc.useModule('ti.sdo.utils.MultiProc');
-MultiProc.setConfig("CORE0", ["HOST", "CORE0", "DSP"]);
+MultiProc.setConfig("IPU", ["HOST", "IPU", "DSP"]);
 
 /* ----------------------------- TICK ---------------------------------------*/
 var Clock = xdc.useModule('ti.sysbios.knl.Clock');

diff --git a/packages/ti/ipc/rpmsg/package.xs b/packages/ti/ipc/rpmsg/package.xs
index 5e7f6a7b1a0d89f53d3e3b0a71f841c612170d8d..726594d29c3ffbbb00294aba2b2ef36e4958d86a 100644 (file)
--- a/packages/ti/ipc/rpmsg/package.xs
+++ b/packages/ti/ipc/rpmsg/package.xs
@@ -68,6 +68,7 @@ function getLibs(prog)
 
     switch (device) {
         case "OMAP4430":
+        case "OMAP5430":
             /* OMAP5 */
             platform = "omap5";
             break;

diff --git a/packages/ti/ipc/tests/package.bld b/packages/ti/ipc/tests/package.bld
index 51fea022a2a3865596b5b858189e2a04f50572e6..4875b8e9c31ebcaa83c64720d8c60fb706f3ee7c 100644 (file)
--- a/packages/ti/ipc/tests/package.bld
+++ b/packages/ti/ipc/tests/package.bld
@@ -74,7 +74,8 @@ for (var i = 0; i < Build.targets.length; i++) {
 //    print("building for target " + targ.name + " ...");
 
     /* currently only build for OMAPL138, Keystone II, and OMAP5*/
-    if (!((targ.isa == "674") || (targ.isa == "66") || (targ.isa == "v7M"))) {
+    if (!((targ.isa == "674") || (targ.isa == "66") ||
+          (targ.isa.match(/v7M(|4)/)))) {
         continue;
     }
 

diff --git a/packages/ti/platform/omap54xx/dsp/Platform.xdc b/packages/ti/platform/omap54xx/dsp/Platform.xdc
index da3c3c4c00d0d983b26bdbd7f7fc311d35a86d40..4c66503d1bd555f96c1daac29767927e015fd3b9 100644 (file)
--- a/packages/ti/platform/omap54xx/dsp/Platform.xdc
+++ b/packages/ti/platform/omap54xx/dsp/Platform.xdc
@@ -40,7 +40,7 @@ metaonly module Platform inherits xdc.platform.IPlatform {
         ti.platforms.generic.Platform.create("plat", {
             clockRate:      466,
             catalogName:    "ti.catalog.c6000",
-            deviceName:     "OMAP4430",
+            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"}],

diff --git a/packages/ti/platform/omap54xx/ipu/Platform.xdc b/packages/ti/platform/omap54xx/ipu/Platform.xdc
index ef196a15121978aee7b0ad4dc173a50c2f3d4016..6c0b2a42d676f34b09e6f5515312322fae4ad415 100644 (file)
--- a/packages/ti/platform/omap54xx/ipu/Platform.xdc
+++ b/packages/ti/platform/omap54xx/ipu/Platform.xdc
@@ -39,8 +39,8 @@ metaonly module Platform inherits xdc.platform.IPlatform {
     config ti.platforms.generic.Platform.Instance plat =
         ti.platforms.generic.Platform.create("plat", {
             clockRate:      212.8,
-            catalogName:    "ti.catalog.arm.cortexm3",
-            deviceName:     "OMAP4430",
+            catalogName:    "ti.catalog.arm.cortexm4",
+            deviceName:     "OMAP5430",
             externalMemoryMap: [
                 ["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"}],

diff --git a/packages/ti/sdo/ipc/family/Settings.xs b/packages/ti/sdo/ipc/family/Settings.xs
index a4523b47d92f735804ed4811283c1a66e990b7df..666a51bcd6a6476019de9ddbd77f142b133f894c 100644 (file)
--- a/packages/ti/sdo/ipc/family/Settings.xs
+++ b/packages/ti/sdo/ipc/family/Settings.xs
@@ -184,6 +184,13 @@ var procNames = {
     'TMS320C6474'       : ["CORE0", "CORE1", "CORE2"],
     'OMAP3530'          : ["DSP", "HOST"],
     'OMAP4430'          : ["DSP", "CORE0", "CORE1", "HOST"],
+
+    /*
+     * Note that only SMP-BIOS is supported on OMAP5430, so there's only
+     * one "IPU" proc defined for the dual-core M4.
+     */
+    'OMAP5430'          : ["DSP", "IPU", "HOST"],
+
     'Arctic'            : ["DSP", "ARP32"],
     'F28M3.*'           : ["M3", "C28"],
     'LM3.*'             : [ "" ],  /* single core, any name can be used */