rpmsg: Add Rpmsg NS 2.0 to OmapL138 platform

Additional of OMAPL138 in upcoming SDK releases will require support of
NS_2.0
( Note: The default will break compatibility with Upstream kernel which
does not support NS_2.0
The Non-NS_2.0 libraries are also created for customer to use, in case
if customer is using upstream kernel, but this will not fully tested)

Signed-off-by: Sam Nelson <sam.nelson@ti.com>

5 files changed, 7 insertions, 5 deletions

diff --git a/packages/ti/ipc/rpmsg/Build.xs b/packages/ti/ipc/rpmsg/Build.xs
index 2d560e2..b444ca4 100644
--- a/packages/ti/ipc/rpmsg/Build.xs
+++ b/packages/ti/ipc/rpmsg/Build.xs
@@ -51,7 +51,7 @@ function getDefs()
     if (target.isa == "674") {
         switch (device) {
             case "OMAPL138":
-                defs += " -DOMAPL138";
+                defs += " -DOMAPL138 -DRPMSG_NS_2_0";
                 break;
             default:
                 throw new Error("Unsupported device: " + device);
diff --git a/packages/ti/ipc/rpmsg/package.bld b/packages/ti/ipc/rpmsg/package.bld
index 0570055..6ee819d 100644
--- a/packages/ti/ipc/rpmsg/package.bld
+++ b/packages/ti/ipc/rpmsg/package.bld
@@ -66,7 +66,7 @@ for (var i = 0; i < Build.targets.length; i++) {
             Pkg.addLibrary("lib/" + profile + "/" + name + "_omapl138", targ, {
                 profile: profile,
                 copts: myCopts,
-                defs: "-DOMAPL138"
+                defs: "-DOMAPL138 -DRPMSG_NS_2_0"
             }).addObjects(objList);
         }
         else if (targ.isa == "66") {
diff --git a/packages/ti/ipc/tests/package.bld b/packages/ti/ipc/tests/package.bld
index 72b4880..9494c72 100644
--- a/packages/ti/ipc/tests/package.bld
+++ b/packages/ti/ipc/tests/package.bld
@@ -516,7 +516,8 @@ 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\.platforms\.sdp5430/)) {
+                platform.match(/^ti\.platforms\.sdp5430/) ||
+                platform.match(/^ti\.platforms\.evmOMAPL138/)) {
             extraDefs = " -DRPMSG_NS_2_0";
         }
 
diff --git a/packages/ti/ipc/transports/package.bld b/packages/ti/ipc/transports/package.bld
index 206da01..367ca4c 100644
--- a/packages/ti/ipc/transports/package.bld
+++ b/packages/ti/ipc/transports/package.bld
@@ -72,7 +72,7 @@ for (var i = 0; i < Build.targets.length; i++) {
             copts: myCopts
         }).addObjects(objList);
 
-        if (targ.isa.match(/^(64T|66|v7M4?)$/)) {
+        if (targ.isa.match(/^(64T|66|674|v7M4?)$/)) {
             /* And for select targets, build a rpmsg2-compatible lib */
             Pkg.addLibrary("lib/" + profile + "/" + name + "_rpmsg2", targ, {
                 profile: profile,
diff --git a/packages/ti/ipc/transports/package.xs b/packages/ti/ipc/transports/package.xs
index 2d54c7d..a37e477 100644
--- a/packages/ti/ipc/transports/package.xs
+++ b/packages/ti/ipc/transports/package.xs
@@ -42,7 +42,8 @@ var rpmsg2Device = {
     'OMAP4430'      : { special: "_rpmsg2" },
     'OMAP5430'      : { special: "_rpmsg2" },
     'Vayu'          : { special: "_rpmsg2" },
-    'TMS320TCI6634' : { special: "_rpmsg2" }
+    'TMS320TCI6634' : { special: "_rpmsg2" },
+    'OMAPL138'      : { special: "_rpmsg2" }
 };
 
 /*