use k2h dts files for rmMemK2L because it should

really use the "test" dts files.  Fix merge error
in rm_shared_test.cfg

diff --git a/test/k2l/c66/bios/rmMemK2LC66BiosTestProject.txt b/test/k2l/c66/bios/rmMemK2LC66BiosTestProject.txt
index 9990ba97378a28ec4639cb58d8d8acfa7f74693a..35a56802a348ed20c2b11cd295fb122ca197d625 100644 (file)
--- a/test/k2l/c66/bios/rmMemK2LC66BiosTestProject.txt
+++ b/test/k2l/c66/bios/rmMemK2LC66BiosTestProject.txt
@@ -1,6 +1,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/src/rm_mem_test.c"
--ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/device/k2l/global-resource-list.c"
--ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/device/k2l/policy_dsp_arm.c"
+-ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/device/k2h/global-resource-list.c"
+-ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/device/k2h/policy_dsp_arm.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/global-resources.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c"

diff --git a/test/k2l/c66/bios/rm_shared_test.cfg b/test/k2l/c66/bios/rm_shared_test.cfg
index 14451a27e0259df6b9d817a576a4de4a64ba393e..2d3048142c7b7b39430f29df7e36e2344f9ec13c 100644 (file)
--- a/test/k2l/c66/bios/rm_shared_test.cfg
+++ b/test/k2l/c66/bios/rm_shared_test.cfg
@@ -65,15 +65,15 @@ var BIOS        = xdc.useModule('ti.sysbios.BIOS');
 BIOS.heapSize   = 0x10000;
 var Task        = xdc.useModule('ti.sysbios.knl.Task');
 
-Program.sectMap[".rmTestSharedHandle"] = new Program.SectionSpec();
-Program.sectMap[".rmTestSharedHandle"] = "MSMCSRAM";
+Program.sectMap[".rmSharedHandleTest"] = new Program.SectionSpec();
+Program.sectMap[".rmSharedHandleTest"] = "MSMCSRAM";
 
 /* Read once when RM_SHARED_SERVER is initialized */
 Program.sectMap[".sharedGRL"] = new Program.SectionSpec();
 Program.sectMap[".sharedGRL"] = "L2SRAM";
 
 Program.sectMap[".sharedGlobalPolicy"] = new Program.SectionSpec();
-Program.sectMap[".sharedGlobalPolicy"] = "MSMCSRAM";
+Program.sectMap[".sharedGlobalPolicy"] = "L2SRAM";
 
 /* Synchronize all processors (this will be done in Ipc_start) */
 Ipc.procSync = Ipc.ProcSync_ALL;