Examples: Move ti.configs.vayu into tests
authorChris Ring <cring@ti.com>
Fri, 18 Oct 2013 17:57:36 +0000 (10:57 -0700)
committerChris Ring <cring@ti.com>
Fri, 18 Oct 2013 21:01:55 +0000 (14:01 -0700)
ti.configs.vayu was a convenience package for reusable config
snippets for IPC tests.  To reinforce this, and discourage outside
use of these snippets, this commit moves the content into the test
package and deletes the ti.configs.vayu package.

13 files changed:
packages/ti/configs/vayu/package.bld [deleted file]
packages/ti/configs/vayu/package.xdc [deleted file]
packages/ti/ipc/tests/Dsp1.cfg [moved from packages/ti/configs/vayu/Dsp1.cfg with 100% similarity]
packages/ti/ipc/tests/Dsp2.cfg [moved from packages/ti/configs/vayu/Dsp2.cfg with 100% similarity]
packages/ti/ipc/tests/IpcCommon_vayu.cfg.xs [moved from packages/ti/configs/vayu/IpcCommon.cfg.xs with 100% similarity]
packages/ti/ipc/tests/Ipu1Smp.cfg [moved from packages/ti/configs/vayu/Ipu1Smp.cfg with 100% similarity]
packages/ti/ipc/tests/Ipu2Smp.cfg [moved from packages/ti/configs/vayu/Ipu2Smp.cfg with 100% similarity]
packages/ti/ipc/tests/IpuAmmu_vayu.cfg [moved from packages/ti/configs/vayu/IpuAmmu.cfg with 100% similarity]
packages/ti/ipc/tests/nameserverapp.cfg
packages/ti/ipc/tests/ping_rpmsg.cfg
packages/ti/ipc/tests/rpmsg_transport.cfg
packages/ti/ipc/tests/test_omx_dsp_vayu.cfg
packages/ti/ipc/tests/test_omx_ipu_vayu.cfg

diff --git a/packages/ti/configs/vayu/package.bld b/packages/ti/configs/vayu/package.bld
deleted file mode 100644 (file)
index f6f6754..0000000
+++ /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/configs/vayu/package.xdc b/packages/ti/configs/vayu/package.xdc
deleted file mode 100644 (file)
index 56334f7..0000000
+++ /dev/null
@@ -1,44 +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.
- */
-/*
- *  ======== package.xdc ========
- *
- */
-
-/*!
- *  ======== ti.configs.vayu ========
- *  Common config files.
- *
- */
-
-package ti.configs.vayu [1,0,0] {
-}
index 426a99fb2ddbf87478c41a5f1fae7091881663a3..dcb5250bc8d2b22f94d88e80ab34d3b6c0d8a740 100644 (file)
@@ -50,22 +50,22 @@ else if (Program.cpu.deviceName.match(/^OMAP5430$/) &&
 }
 else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
          Program.cpu.attrs.cpuCore.match(/^CM4$/)) {
-    xdc.loadCapsule("ti/configs/vayu/IpcCommon.cfg.xs");
+    xdc.loadCapsule("IpcCommon_vayu.cfg.xs");
     if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX\:ipu1/)) {
-        xdc.includeFile("ti/configs/vayu/Ipu1Smp.cfg");
+        xdc.loadCapsule("Ipu1Smp.cfg");
     }
     else {
-        xdc.includeFile("ti/configs/vayu/Ipu2Smp.cfg");
+        xdc.loadCapsule("Ipu2Smp.cfg");
     }
-    xdc.includeFile("ti/configs/vayu/IpuAmmu.cfg");
+    xdc.loadCapsule("IpuAmmu_vayu.cfg");
 }
 else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
          Program.cpu.attrs.cpuCore.match(/^6600$/)) {
     if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX\:dsp1/)) {
-        xdc.includeFile("ti/configs/vayu/Dsp1.cfg");
+        xdc.loadCapsule("Dsp1.cfg");
     }
     else {
-        xdc.includeFile("ti/configs/vayu/Dsp2.cfg");
+        xdc.loadCapsule("Dsp2.cfg");
     }
 }
 else {
index 5cfea31ea8a2e699d1c46fa93cfd3d01c7f70cb5..4b36c1eb83b2dbe79e97886557e00801b73f01fb 100644 (file)
@@ -85,14 +85,14 @@ else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
     var BIOS        = xdc.useModule('ti.sysbios.BIOS');
     BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup');
 
-    xdc.loadCapsule("ti/configs/vayu/IpcCommon.cfg.xs");
+    xdc.loadCapsule("IpcCommon_vayu.cfg.xs");
     if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX\:ipu1/)) {
-        xdc.includeFile("ti/configs/vayu/Ipu1Smp.cfg");
+        xdc.loadCapsule("Ipu1Smp.cfg");
     }
     else {
-        xdc.includeFile("ti/configs/vayu/Ipu2Smp.cfg");
+        xdc.loadCapsule("Ipu2Smp.cfg");
     }
-    xdc.includeFile("ti/configs/vayu/IpuAmmu.cfg");
+    xdc.loadCapsule("IpuAmmu_vayu.cfg");
 }
 else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
          Program.cpu.attrs.cpuCore.match(/^6600$/)) {
@@ -109,10 +109,10 @@ else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
     BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup');
 
     if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX\:dsp1/)) {
-        xdc.includeFile("ti/configs/vayu/Dsp1.cfg");
+        xdc.loadCapsule("Dsp1.cfg");
     }
     else {
-        xdc.includeFile("ti/configs/vayu/Dsp2.cfg");
+        xdc.loadCapsule("Dsp2.cfg");
     }
 }
 else {
index 4a0f0413a097de2a60191da48ceef396faca60d7..f1ab37aa61b3cb7f422c6ceb26f3b715a5761fb4 100644 (file)
@@ -94,14 +94,14 @@ else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
     var MessageQ  = xdc.useModule('ti.sdo.ipc.MessageQ');
     MessageQ.registerHeapMeta(msgHeap, 0);
 
-    xdc.loadCapsule("ti/configs/vayu/IpcCommon.cfg.xs");
+    xdc.loadCapsule("IpcCommon_vayu.cfg.xs");
     if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX\:ipu1/)) {
-        xdc.includeFile("ti/configs/vayu/Ipu1Smp.cfg");
+        xdc.loadCapsule("Ipu1Smp.cfg");
     }
     else {
-        xdc.includeFile("ti/configs/vayu/Ipu2Smp.cfg");
+        xdc.loadCapsule("Ipu2Smp.cfg");
     }
-    xdc.includeFile("ti/configs/vayu/IpuAmmu.cfg");
+    xdc.loadCapsule("IpuAmmu_vayu.cfg");
 }
 else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
          Program.cpu.attrs.cpuCore.match(/^6600$/)) {
@@ -121,10 +121,10 @@ else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) &&
     MessageQ.registerHeapMeta(msgHeap, 0);
 
     if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX\:dsp1/)) {
-        xdc.includeFile("ti/configs/vayu/Dsp1.cfg");
+        xdc.loadCapsule("Dsp1.cfg");
     }
     else {
-        xdc.includeFile("ti/configs/vayu/Dsp2.cfg");
+        xdc.loadCapsule("Dsp2.cfg");
     }
 }
 else {
index 4795b6ef36609984d8cb16392ff45b2add82438b..16766d28bce207a25437a356a4bd812c9f76be5d 100644 (file)
@@ -49,10 +49,10 @@ rcmSettings.ipc = rcmSettings.IpcSupport_ti_sdo_ipc;
 xdc.useModule('ti.grcm.RcmServer');
 
 if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX\:dsp1/)) {
-    xdc.includeFile("ti/configs/vayu/Dsp1.cfg");
+    xdc.loadCapsule("Dsp1.cfg");
 }
 else {
-    xdc.includeFile("ti/configs/vayu/Dsp2.cfg");
+    xdc.loadCapsule("Dsp2.cfg");
 }
 
 var Task = xdc.useModule('ti.sysbios.knl.Task');
index fd50568cb75f20ae8824a928459cae567bd112d7..9802c1ba9d0d3b0e619e9cb2b2a30ca48cbd91a6 100644 (file)
@@ -48,14 +48,14 @@ var rcmSettings = xdc.useModule('ti.grcm.Settings');
 rcmSettings.ipc = rcmSettings.IpcSupport_ti_sdo_ipc;
 xdc.useModule('ti.grcm.RcmServer');
 
-xdc.loadCapsule("ti/configs/vayu/IpcCommon.cfg.xs");
+xdc.loadCapsule("IpcCommon_vayu.cfg.xs");
 if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX\:ipu1/)) {
-    xdc.includeFile("ti/configs/vayu/Ipu1Smp.cfg");
+    xdc.loadCapsule("Ipu1Smp.cfg");
 }
 else {
-    xdc.includeFile("ti/configs/vayu/Ipu2Smp.cfg");
+    xdc.loadCapsule("Ipu2Smp.cfg");
 }
-xdc.loadCapsule("ti/configs/vayu/IpuAmmu.cfg");
+xdc.loadCapsule("IpuAmmu_vayu.cfg");
 
 var Task = xdc.useModule('ti.sysbios.knl.Task');
 Task.defaultStackSize = 12 * 0x400;