tests: Update messageq_multicore to use ti.ipc.remoteproc.Resource

Before this fix, the rsc table header file was included directly in C
code. And the table was getting optimized away due to no direct
reference to the resource table. This resulted in failure of test
downloaded through user space loader.

Instead added the configuration to include the resource table (without
vdev and vring) through configuration file, which is more cleaner.

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

diff --git a/packages/ti/ipc/tests/messageq_multicore.c b/packages/ti/ipc/tests/messageq_multicore.c
index 59cf83bc00d90fea324aab2531d56076eb306455..b89494bf03c3563ece59ee60b46a4ef6c5f5744c 100644 (file)
--- a/packages/ti/ipc/tests/messageq_multicore.c
+++ b/packages/ti/ipc/tests/messageq_multicore.c
@@ -64,17 +64,6 @@
 /*  ----------------------------------- To get globals from .cfg Header */
 #include <xdc/cfg/global.h>
 
-/* Define this to eliminate VIRTIO DEV and VRINGS from rsc_table: */
-#define  TRACE_RESOURCE_ONLY 1
-extern char * xdc_runtime_SysMin_Module_State_0_outbuf__A;
-#if defined(TCI6614)
-#include <ti/ipc/remoteproc/rsc_table_tci6614.h>
-#elif defined(TCI6614_v33)
-#include <ti/ipc/remoteproc/rsc_table_tci6614_v3.3.h>
-#elif defined(TCI6638)
-#include <ti/ipc/remoteproc/rsc_table_tci6638.h>
-#endif
-
 #define HEAP_NAME   "myHeapBuf"
 #define HEAPID      0
 #define NUMLOOPS    10

diff --git a/packages/ti/ipc/tests/messageq_multicore.cfg b/packages/ti/ipc/tests/messageq_multicore.cfg
index f2bea45df2b344508bec40b4a7c5d42dd28089a3..1302d81d50f54c71906f512ac86f6868e3a75f14 100644 (file)
--- a/packages/ti/ipc/tests/messageq_multicore.cfg
+++ b/packages/ti/ipc/tests/messageq_multicore.cfg
@@ -101,6 +101,10 @@ System.SupportProxy = SysMin;
 Program.global.sysMinBufSize = 0x8000;
 SysMin.bufSize  =  Program.global.sysMinBufSize;
 
+var Resource = xdc.useModule('ti.ipc.remoteproc.Resource');
+Resource.loadSegment = Program.platform.dataMemory;
+Resource.traceOnly = true;
+
 Program.sectMap[".text:_c_int00"] = new Program.SectionSpec();
 Program.sectMap[".text:_c_int00"].loadSegment = "L2SRAM";
 Program.sectMap[".text:_c_int00"].loadAlign = 0x400;