From 86b312ab5495c67b7ddcf05868b2b7aab3e62e29 Mon Sep 17 00:00:00 2001 From: Ramsey Harris Date: Fri, 11 Sep 2015 14:14:04 -0700 Subject: Eliminate config warning raised by ti.sdo.ipcmgr Replace xdc.loadPackage of ti.sdo.ipcmgr with xdc.useModule of ti.sdo.ipcmgr.IpcMgr. --- packages/ti/ipc/tests/gatempapp.cfg | 36 ++++++++++++++++++++++++-- packages/ti/ipc/tests/messageq_common.cfg.xs | 4 +-- packages/ti/ipc/tests/nameserverapp.cfg | 10 +++---- packages/ti/ipc/tests/ping_rpmsg.cfg | 18 ++++++------- packages/ti/ipc/tests/ping_rpmsg_common.cfg.xs | 4 +-- packages/ti/ipc/tests/rpmsg_transport.cfg | 18 ++++++------- packages/ti/ipc/tests/test_omx_dsp_omap5.cfg | 6 ++--- packages/ti/ipc/tests/test_omx_dsp_vayu.cfg | 6 ++--- packages/ti/ipc/tests/test_omx_ipu_omap5.cfg | 6 ++--- packages/ti/ipc/tests/test_omx_ipu_vayu.cfg | 6 ++--- 10 files changed, 73 insertions(+), 41 deletions(-) (limited to 'packages') diff --git a/packages/ti/ipc/tests/gatempapp.cfg b/packages/ti/ipc/tests/gatempapp.cfg index 8a02b4e..1a90a86 100644 --- a/packages/ti/ipc/tests/gatempapp.cfg +++ b/packages/ti/ipc/tests/gatempapp.cfg @@ -1,3 +1,35 @@ +/* + * Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com + * + * 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. + */ + /* root of the configuration object model */ var Program = xdc.useModule('xdc.cfg.Program'); @@ -21,8 +53,8 @@ xdc.loadPackage('ti.ipc.family.vayu'); /* * ======== IPC Configuration ======== */ -xdc.loadPackage('ti.ipc.ipcmgr'); -var BIOS = xdc.useModule('ti.sysbios.BIOS'); +xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); +var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); BIOS.addUserStartupFunction('&IpcMgr_callIpcStart'); diff --git a/packages/ti/ipc/tests/messageq_common.cfg.xs b/packages/ti/ipc/tests/messageq_common.cfg.xs index 2ebec69..4fdf4c2 100644 --- a/packages/ti/ipc/tests/messageq_common.cfg.xs +++ b/packages/ti/ipc/tests/messageq_common.cfg.xs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014, Texas Instruments Incorporated + * Copyright (c) 2012-2015 Texas Instruments Incorporated - http://www.ti.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -231,7 +231,7 @@ else { Hwi.enableException = true; -xdc.loadPackage('ti.ipc.ipcmgr'); +xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); var HeapBuf = xdc.useModule('ti.sysbios.heaps.HeapBuf'); diff --git a/packages/ti/ipc/tests/nameserverapp.cfg b/packages/ti/ipc/tests/nameserverapp.cfg index ac5d24c..3fd9079 100644 --- a/packages/ti/ipc/tests/nameserverapp.cfg +++ b/packages/ti/ipc/tests/nameserverapp.cfg @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015, Texas Instruments Incorporated + * Copyright (c) 2013-2015 Texas Instruments Incorporated - http://www.ti.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ var BIOS = xdc.useModule('ti.sysbios.BIOS'); /* Bring in the platform-specific config */ if (Program.cpu.deviceName.match(/^OMAP5430$/) && Program.cpu.attrs.cpuCore.match(/^CM4$/)) { - xdc.loadPackage('ti.ipc.ipcmgr'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); xdc.loadCapsule("IpcCommon_omap5.cfg.xs"); @@ -44,7 +44,7 @@ if (Program.cpu.deviceName.match(/^OMAP5430$/) && } else if (Program.cpu.deviceName.match(/^OMAP5430$/) && Program.cpu.attrs.cpuCore.match(/^64T$/)) { - xdc.loadPackage('ti.ipc.ipcmgr'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); xdc.loadCapsule("Dsp.cfg"); @@ -52,7 +52,7 @@ else if (Program.cpu.deviceName.match(/^OMAP5430$/) && } else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) && Program.cpu.attrs.cpuCore.match(/^CM4$/)) { - xdc.loadPackage('ti.ipc.ipcmgr'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); xdc.loadCapsule("IpcCommon_vayu.cfg.xs"); if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX\:ipu1/)) { @@ -65,7 +65,7 @@ else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) && } else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) && Program.cpu.attrs.cpuCore.match(/^6600$/)) { - xdc.loadPackage('ti.ipc.ipcmgr'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); xdc.loadCapsule("Dsp_vayu.cfg"); } diff --git a/packages/ti/ipc/tests/ping_rpmsg.cfg b/packages/ti/ipc/tests/ping_rpmsg.cfg index 79a17c4..684267f 100644 --- a/packages/ti/ipc/tests/ping_rpmsg.cfg +++ b/packages/ti/ipc/tests/ping_rpmsg.cfg @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014, Texas Instruments Incorporated + * Copyright (c) 2012-2015 Texas Instruments Incorporated - http://www.ti.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,8 +39,8 @@ if (Program.cpu.deviceName.match(/^OMAP5430$/) && Program.cpu.attrs.cpuCore.match(/^CM4$/)) { /* This calls RPMessage_init() once before BIOS_start(): */ - xdc.loadPackage('ti.ipc.ipcmgr'); - var BIOS = xdc.useModule('ti.sysbios.BIOS'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); + var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup'); xdc.loadCapsule("IpcCommon_omap5.cfg.xs"); @@ -52,8 +52,8 @@ else if (Program.cpu.deviceName.match(/^OMAP5430$/) && Program.cpu.attrs.cpuCore.match(/^64T$/)) { /* This calls RPMessage_init() once before BIOS_start(): */ - xdc.loadPackage('ti.ipc.ipcmgr'); - var BIOS = xdc.useModule('ti.sysbios.BIOS'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); + var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup'); xdc.loadCapsule("Dsp.cfg"); @@ -63,8 +63,8 @@ else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) && Program.cpu.attrs.cpuCore.match(/^CM4$/)) { /* This calls RPMessage_init() once before BIOS_start(): */ - xdc.loadPackage('ti.ipc.ipcmgr'); - var BIOS = xdc.useModule('ti.sysbios.BIOS'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); + var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup'); xdc.loadCapsule("IpcCommon_vayu.cfg.xs"); @@ -80,8 +80,8 @@ else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) && Program.cpu.attrs.cpuCore.match(/^6600$/)) { /* This calls RPMessage_init() once before BIOS_start(): */ - xdc.loadPackage('ti.ipc.ipcmgr'); - var BIOS = xdc.useModule('ti.sysbios.BIOS'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); + var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup'); xdc.loadCapsule("Dsp_vayu.cfg"); diff --git a/packages/ti/ipc/tests/ping_rpmsg_common.cfg.xs b/packages/ti/ipc/tests/ping_rpmsg_common.cfg.xs index 19a088c..ba8ad1d 100644 --- a/packages/ti/ipc/tests/ping_rpmsg_common.cfg.xs +++ b/packages/ti/ipc/tests/ping_rpmsg_common.cfg.xs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014, Texas Instruments Incorporated + * Copyright (c) 2012-2015 Texas Instruments Incorporated - http://www.ti.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -205,7 +205,7 @@ else { Hwi.enableException = true; -xdc.loadPackage('ti.ipc.ipcmgr'); +xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup'); xdc.loadPackage('ti.ipc.rpmsg'); diff --git a/packages/ti/ipc/tests/rpmsg_transport.cfg b/packages/ti/ipc/tests/rpmsg_transport.cfg index 21386d0..6bc81fd 100644 --- a/packages/ti/ipc/tests/rpmsg_transport.cfg +++ b/packages/ti/ipc/tests/rpmsg_transport.cfg @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014, Texas Instruments Incorporated + * Copyright (c) 2012-2015 Texas Instruments Incorporated - http://www.ti.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,8 +38,8 @@ if (Program.cpu.deviceName.match(/^OMAP5430$/) && Program.cpu.attrs.cpuCore.match(/^CM4$/)) { /* This initializes the MessageQ Transport RPMSG stack: */ - xdc.loadPackage('ti.ipc.ipcmgr'); - var BIOS = xdc.useModule('ti.sysbios.BIOS'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); + var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); var HeapBuf = xdc.useModule('ti.sysbios.heaps.HeapBuf'); @@ -60,8 +60,8 @@ if (Program.cpu.deviceName.match(/^OMAP5430$/) && else if (Program.cpu.deviceName.match(/^OMAP5430$/) && Program.cpu.attrs.cpuCore.match(/^64T$/)) { /* This initializes the MessageQ Transport RPMSG stack: */ - xdc.loadPackage('ti.ipc.ipcmgr'); - var BIOS = xdc.useModule('ti.sysbios.BIOS'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); + var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); var HeapBuf = xdc.useModule('ti.sysbios.heaps.HeapBuf'); @@ -80,8 +80,8 @@ else if (Program.cpu.deviceName.match(/^OMAP5430$/) && else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) && Program.cpu.attrs.cpuCore.match(/^CM4$/)) { /* This initializes the MessageQ Transport RPMSG stack: */ - xdc.loadPackage('ti.ipc.ipcmgr'); - var BIOS = xdc.useModule('ti.sysbios.BIOS'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); + var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); var HeapBuf = xdc.useModule('ti.sysbios.heaps.HeapBuf'); @@ -106,8 +106,8 @@ else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) && else if (Program.platformName.match(/^ti\.platforms\.evmDRA7XX/) && Program.cpu.attrs.cpuCore.match(/^6600$/)) { /* This initializes the MessageQ Transport RPMSG stack: */ - xdc.loadPackage('ti.ipc.ipcmgr'); - var BIOS = xdc.useModule('ti.sysbios.BIOS'); + xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); + var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_ipcStartup'); var HeapBuf = xdc.useModule('ti.sysbios.heaps.HeapBuf'); diff --git a/packages/ti/ipc/tests/test_omx_dsp_omap5.cfg b/packages/ti/ipc/tests/test_omx_dsp_omap5.cfg index 3cfb864..dd477b3 100644 --- a/packages/ti/ipc/tests/test_omx_dsp_omap5.cfg +++ b/packages/ti/ipc/tests/test_omx_dsp_omap5.cfg @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014, Texas Instruments Incorporated + * Copyright (c) 2013-2015 Texas Instruments Incorporated - http://www.ti.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,8 +31,8 @@ */ /* This calls MessageQCopy_init() once before BIOS_start(): */ -xdc.loadPackage('ti.ipc.ipcmgr'); -var BIOS = xdc.useModule('ti.sysbios.BIOS'); +xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); +var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup'); BIOS.addUserStartupFunction('®ister_MxServer'); diff --git a/packages/ti/ipc/tests/test_omx_dsp_vayu.cfg b/packages/ti/ipc/tests/test_omx_dsp_vayu.cfg index 416d6a1..e3b95f4 100644 --- a/packages/ti/ipc/tests/test_omx_dsp_vayu.cfg +++ b/packages/ti/ipc/tests/test_omx_dsp_vayu.cfg @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015, Texas Instruments Incorporated + * Copyright (c) 2013-2015 Texas Instruments Incorporated - http://www.ti.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,8 +31,8 @@ */ /* This calls MessageQCopy_init() once before BIOS_start(): */ -xdc.loadPackage('ti.ipc.ipcmgr'); -var BIOS = xdc.useModule('ti.sysbios.BIOS'); +xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); +var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup'); BIOS.addUserStartupFunction('®ister_MxServer'); diff --git a/packages/ti/ipc/tests/test_omx_ipu_omap5.cfg b/packages/ti/ipc/tests/test_omx_ipu_omap5.cfg index ef9fb4c..d96d874 100644 --- a/packages/ti/ipc/tests/test_omx_ipu_omap5.cfg +++ b/packages/ti/ipc/tests/test_omx_ipu_omap5.cfg @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Texas Instruments Incorporated + * Copyright (c) 2013-2015 Texas Instruments Incorporated - http://www.ti.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,8 +31,8 @@ */ /* This calls RPMessage_init() once before BIOS_start(): */ -xdc.loadPackage('ti.ipc.ipcmgr'); -var BIOS = xdc.useModule('ti.sysbios.BIOS'); +xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); +var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup'); BIOS.addUserStartupFunction('®ister_MxServer'); diff --git a/packages/ti/ipc/tests/test_omx_ipu_vayu.cfg b/packages/ti/ipc/tests/test_omx_ipu_vayu.cfg index 9802c1b..b6a6909 100644 --- a/packages/ti/ipc/tests/test_omx_ipu_vayu.cfg +++ b/packages/ti/ipc/tests/test_omx_ipu_vayu.cfg @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Texas Instruments Incorporated + * Copyright (c) 2013-2015 Texas Instruments Incorporated - http://www.ti.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,8 +31,8 @@ */ /* This calls RPMessage_init() once before BIOS_start(): */ -xdc.loadPackage('ti.ipc.ipcmgr'); -var BIOS = xdc.useModule('ti.sysbios.BIOS'); +xdc.useModule('ti.ipc.ipcmgr.IpcMgr'); +var BIOS = xdc.useModule('ti.sysbios.BIOS'); BIOS.addUserStartupFunction('&IpcMgr_rpmsgStartup'); BIOS.addUserStartupFunction('®ister_MxServer'); -- cgit v1.2.3