OMAP5: Fixes to ti.ipc.family.omap54xx build script
authorChris Ring <cring@ti.com>
Wed, 3 Apr 2013 23:12:07 +0000 (16:12 -0700)
committerChris Ring <cring@ti.com>
Wed, 3 Apr 2013 23:12:07 +0000 (16:12 -0700)
Rename the actual library name from errant ti.ipc.rpmsg... to
ti.ipc.family.omap54xx...

Remove the non-SMP library (SMP BIOS is required for OMAP5).

Create M4 libraries in addition to existing M3 libraries (keeping M3 libs
for backward compatibility - we may deprecate and/or remove them in the
future).

packages/ti/ipc/family/omap54xx/package.bld
packages/ti/ipc/family/omap54xx/package.xs

index 3e38415d727be71db5460f906951cdd182431ad1..cb116628fcbd4b89d3106c2ff6cb9c3a01c76f43 100644 (file)
@@ -52,10 +52,10 @@ Pkg.generatedFiles.$add("lib/");
 /* list of libraries to build */
 var libArray = new Array();
 
-/* rpmsg library for IPU SMP target */
+/* IPU SMP library */
 libArray.push(
     {
-        name: "ti.ipc.rpmsg_smp",
+        name: "ti.ipc.family.omap54xx_smp",
         sources: [
             "VirtQueue",
             "InterruptIpu",
@@ -63,30 +63,14 @@ libArray.push(
         libAttrs: {
             defs: " -DSMP"
         },
-        isas: [ "v7M" ],
+        isas: [ "v7M", "v7M4" ],
     }
 );
 
-/* rpmsg library for IPU non-SMP target */
+/* DSP library */
 libArray.push(
     {
-        name: "ti.ipc.rpmsg",
-        sources: [
-            "VirtQueue",
-            "InterruptIpu",
-            "OffloadM3",
-        ],
-        libAttrs: {
-            defs: " -DM3_ONLY"
-        },
-        isas: [ "v7M" ],
-    }
-);
-
-/* rpmsg library for DSP target */
-libArray.push(
-    {
-        name: "ti.ipc.rpmsg",
+        name: "ti.ipc.family.omap54xx",
         sources: [
             "VirtQueue",
             "InterruptDsp",
index 8812256d92164b60491a097938293501e76fade3..ab25cba82112e285f0a1fb9cae297d1a1ede68ef 100644 (file)
@@ -70,12 +70,12 @@ function getLibs(prog)
     }
 
     /* make sure the library exists, else fallback to a built library */
-    file = "lib/" + profile + "/ti.ipc.rpmsg" + smp + ".a" + suffix;
+    file = "lib/" + profile + "/ti.ipc.family.omap54xx" + smp + ".a" + suffix;
     if (java.io.File(this.packageBase + file).exists()) {
         libAry.push(file);
     }
     else {
-        file = "lib/release/ti.ipc.rpmsg" + smp + ".a" + suffix;
+        file = "lib/release/ti.ipc.family.omap54xx" + smp + ".a" + suffix;
         if (java.io.File(this.packageBase + file).exists()) {
             libAry.push(file);
         }