From c18fece0c9f0dc76361dc1ee11b7ee2417479847 Mon Sep 17 00:00:00 2001 From: Chris Ring Date: Tue, 4 Mar 2014 13:23:16 -0800 Subject: [PATCH] Test: Fix NameServerApp config IpcMgr_ipcStartup() was being added twice to the BIOS startup function - once in nameserverapp.cfg (which is removed in this commit) and again in messageq_common.cfg.xs (which is included by nameserverapp.cfg). In addition to just being wrong, this resulted in an abort on Keystone 2 devices. Also, the MessageQ.SetupTransportProxy was errantly not assigned in the nameserverapp.cfg script. This resulted in MessageQ.xs pulling in 'default' MessageQ configuration, which pulled in much more content than was necessary for this test (for example, TransportShm, which then pulled in GateMP, SharedRegion, etc). By explicitly assigning MessageQ.SetupTransportProxy to the ti.ipc.transports.TransportRpmsgSetup module, these extra [unused] modules are no longer pulled in. --- packages/ti/ipc/tests/nameserverapp.cfg | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/ti/ipc/tests/nameserverapp.cfg b/packages/ti/ipc/tests/nameserverapp.cfg index 98c579e..731a710 100644 --- a/packages/ti/ipc/tests/nameserverapp.cfg +++ b/packages/ti/ipc/tests/nameserverapp.cfg @@ -31,11 +31,6 @@ */ -/* This initializes the RPMSG stack */ -xdc.loadPackage('ti.ipc.ipcmgr'); -var BIOS = xdc.useModule('ti.sysbios.BIOS'); -BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); - /* Bring in the platform-specific config */ if (Program.cpu.deviceName.match(/^OMAP5430$/) && Program.cpu.attrs.cpuCore.match(/^CM4$/)) { @@ -68,6 +63,8 @@ else { } var VirtioSetup = xdc.useModule('ti.ipc.transports.TransportRpmsgSetup'); +var MessageQ = xdc.useModule('ti.sdo.ipc.MessageQ'); +MessageQ.SetupTransportProxy = VirtioSetup; var NameServer = xdc.useModule("ti.sdo.utils.NameServer"); var NsRemote = xdc.useModule("ti.ipc.namesrv.NameServerRemoteRpmsg"); -- 2.39.2