Config and package updates for new XDCtools and SYS/BIOS builds

This fixes build and configuration issues for the following imports:

	SYS/BIOS 6.35.02.44_eng
	XDCtools 3.25.01.64_eng

Signed-off-by: Ramsey Harris <ramsey@ti.com>

diff --git a/packages/ti/configs/vayu/IpcCommon.cfg.xs b/packages/ti/configs/vayu/IpcCommon.cfg.xs
index 2132b5a4a60224fc295844a743d1b6ad8fc2c3fd..3b0c0d1919f05e508088d20cb5e00825da04b180 100644 (file)
--- a/packages/ti/configs/vayu/IpcCommon.cfg.xs
+++ b/packages/ti/configs/vayu/IpcCommon.cfg.xs
@@ -116,13 +116,13 @@ var StackDbg = xdc.useModule('ti.trace.StackDbg');
 
 var dmTimer = xdc.useModule('ti.sysbios.timers.dmtimer.Timer');
 /* dmTimer 0 mapped to GPT3 */
-dmTimer.timerSettings[0].baseAddr = 0x68034000;
+dmTimer.timerSettings[2].baseAddr = 0x68034000;
 /* dmTimer 1 mapped to GPT4 */
-dmTimer.timerSettings[1].baseAddr = 0x68036000;
+dmTimer.timerSettings[3].baseAddr = 0x68036000;
 /* dmTimer 2 mapped to GPT9 */
-dmTimer.timerSettings[2].baseAddr = 0x6803E000;
+dmTimer.timerSettings[8].baseAddr = 0x6803E000;
 /* dmTimer 3 mapped to GPT11 */
-dmTimer.timerSettings[3].baseAddr = 0x68088000;
+dmTimer.timerSettings[10].baseAddr = 0x68088000;
 
 /* Skip the Timer frequency verification check. Need to remove this later */
 dmTimer.checkFrequency = false;

diff --git a/packages/ti/configs/vayu/Ipu2Smp.cfg b/packages/ti/configs/vayu/Ipu2Smp.cfg
index 617c0568e7c3b7401feeb75f458f8633716d1d64..a172b9818446dbac1bd08450a67aa9714a5b9368 100644 (file)
--- a/packages/ti/configs/vayu/Ipu2Smp.cfg
+++ b/packages/ti/configs/vayu/Ipu2Smp.cfg
@@ -46,7 +46,7 @@ Core.ipuId = 2;
 var Clock = xdc.useModule('ti.sysbios.knl.Clock');
 Clock.tickSource = Clock.TickSource_USER;
 /* Configure GPTimer3 as BIOS clock source */
-Clock.timerId = 0;
+Clock.timerId = 2;
 
 var Timer = xdc.useModule('ti.sysbios.timers.dmtimer.Timer');
 var timerParams = new Timer.Params();

diff --git a/packages/ti/sdo/ipc/family/vayu/InterruptDsp.c b/packages/ti/sdo/ipc/family/vayu/InterruptDsp.c
index d1bbaf0eacc89265cb23e9397dbe5bbb84d1bc05..7a169a35a41b2c44cb7d878d6c51d8bb66789ce8 100644 (file)
--- a/packages/ti/sdo/ipc/family/vayu/InterruptDsp.c
+++ b/packages/ti/sdo/ipc/family/vayu/InterruptDsp.c
@@ -38,7 +38,7 @@
 #include <xdc/runtime/System.h>
 #include <xdc/runtime/Assert.h>
 
-#include <ti/sysbios/hal/vayu/IntXbar.h>
+#include <ti/sysbios/family/shared/vayu/IntXbar.h>
 
 #include <ti/sysbios/family/c64p/Hwi.h>
 #include <ti/sysbios/family/c64p/EventCombiner.h>

diff --git a/packages/ti/sdo/ipc/family/vayu/InterruptDsp.xs b/packages/ti/sdo/ipc/family/vayu/InterruptDsp.xs
index fb3166b0ed56804e48f817e2ba89cb435a61ba76..75897ed236a9396f8b9b74fee13346c95f81fe97 100644 (file)
--- a/packages/ti/sdo/ipc/family/vayu/InterruptDsp.xs
+++ b/packages/ti/sdo/ipc/family/vayu/InterruptDsp.xs
@@ -45,7 +45,7 @@ function module$use()
     EventCombiner    = xdc.useModule("ti.sysbios.family.c64p.EventCombiner");
     Ipc              = xdc.useModule("ti.sdo.ipc.Ipc");
     InterruptDsp     = xdc.useModule("ti.sdo.ipc.family.vayu.InterruptDsp");
-    Xbar             = xdc.useModule("ti.sysbios.hal.vayu.IntXbar");
+    Xbar             = xdc.useModule("ti.sysbios.family.shared.vayu.IntXbar");
     TableInit        = xdc.useModule("ti.sdo.ipc.family.vayu.TableInit");
 
     /* Initialize procIdTable */

diff --git a/packages/ti/sdo/ipc/family/vayu/InterruptHost.c b/packages/ti/sdo/ipc/family/vayu/InterruptHost.c
index 0768b50076d9b841f6a35a7c09ea3cf5c6d5d900..574f6f744babda773e35f7f040852caa0938a266 100644 (file)
--- a/packages/ti/sdo/ipc/family/vayu/InterruptHost.c
+++ b/packages/ti/sdo/ipc/family/vayu/InterruptHost.c
@@ -39,7 +39,7 @@
 #include <xdc/runtime/System.h>
 #include <xdc/runtime/Startup.h>
 
-#include <ti/sysbios/hal/vayu/IntXbar.h>
+#include <ti/sysbios/family/shared/vayu/IntXbar.h>
 #include <ti/sysbios/family/arm/gic/Hwi.h>
 #include <ti/sdo/ipc/notifyDrivers/IInterrupt.h>
 #include <ti/sdo/ipc/_Ipc.h>

diff --git a/packages/ti/sdo/ipc/family/vayu/InterruptHost.xs b/packages/ti/sdo/ipc/family/vayu/InterruptHost.xs
index 4cdadf6bc84acbd9d51b29f3513d813a17a763b7..8e62fcb746758a390ced4ccfd4566b72863361cd 100644 (file)
--- a/packages/ti/sdo/ipc/family/vayu/InterruptHost.xs
+++ b/packages/ti/sdo/ipc/family/vayu/InterruptHost.xs
@@ -48,7 +48,7 @@ function module$use()
     Hwi              = xdc.useModule("ti.sysbios.family.arm.gic.Hwi");
     Ipc              = xdc.useModule("ti.sdo.ipc.Ipc");
     Host             = xdc.useModule("ti.sdo.ipc.family.vayu.InterruptHost");
-    Xbar             = xdc.useModule("ti.sysbios.hal.vayu.IntXbar");
+    Xbar             = xdc.useModule("ti.sysbios.family.shared.vayu.IntXbar");
     Mmu              = xdc.useModule("ti.sysbios.family.arm.a15.Mmu");
     TableInit        = xdc.useModule("ti.sdo.ipc.family.vayu.TableInit");
 

diff --git a/packages/ti/sdo/ipc/family/vayu/InterruptIpu.c b/packages/ti/sdo/ipc/family/vayu/InterruptIpu.c
index e440b61793683598b5a1fc236151d77a890a5c64..899be76b2a9a9e1963cb378e7dd54ad0d292e3f4 100644 (file)
--- a/packages/ti/sdo/ipc/family/vayu/InterruptIpu.c
+++ b/packages/ti/sdo/ipc/family/vayu/InterruptIpu.c
@@ -40,7 +40,7 @@
 #include <xdc/runtime/Startup.h>
 
 #include <ti/sysbios/BIOS.h>
-#include <ti/sysbios/hal/vayu/IntXbar.h>
+#include <ti/sysbios/family/shared/vayu/IntXbar.h>
 #include <ti/sysbios/family/arm/m3/Hwi.h>
 #include <ti/sysbios/family/arm/ducati/Core.h>
 #include <ti/sdo/ipc/notifyDrivers/IInterrupt.h>

diff --git a/packages/ti/sdo/ipc/family/vayu/InterruptIpu.xs b/packages/ti/sdo/ipc/family/vayu/InterruptIpu.xs
index 20681f3a704a99d707d8be9511c6bbcc45a89f7f..682f62dfca18270762df45142c071b42b379cb15 100644 (file)
--- a/packages/ti/sdo/ipc/family/vayu/InterruptIpu.xs
+++ b/packages/ti/sdo/ipc/family/vayu/InterruptIpu.xs
@@ -48,7 +48,7 @@ function module$use()
     Hwi             = xdc.useModule("ti.sysbios.family.arm.m3.Hwi");
     Core            = xdc.useModule("ti.sysbios.family.arm.ducati.Core");
     Ipu             = xdc.useModule("ti.sdo.ipc.family.vayu.InterruptIpu");
-    Xbar            = xdc.useModule("ti.sysbios.hal.vayu.IntXbar");
+    Xbar            = xdc.useModule("ti.sysbios.family.shared.vayu.IntXbar");
     TableInit       = xdc.useModule("ti.sdo.ipc.family.vayu.TableInit");
 
     /* Initisalize procIdTable */