fixed build errors for TI-RTOS.

pull/1/head
Vikram Adiga 2014-11-17 14:49:31 -08:00
parent 59e62b7c49
commit e0bec88f76
6 changed files with 65 additions and 53 deletions

1
tirtos/.gitignore vendored 100644
View File

@ -0,0 +1 @@
**/.xdcenv.mak

View File

@ -32,5 +32,5 @@ Included Files
Examples Application Examples Application
-------------------- --------------------
A simple 'TCP echo server with SSL' example application is provided with TI-RTOS A simple 'TCP echo server with TLS' example application is provided with TI-RTOS
product. Look in the TI-RTOS user guide for instructions to build examples. product. Look in the TI-RTOS user guide for instructions to build examples.

View File

@ -11,7 +11,7 @@ var Main = xdc.useModule('xdc.runtime.Main');
var Memory = xdc.useModule('xdc.runtime.Memory'); var Memory = xdc.useModule('xdc.runtime.Memory');
var System = xdc.useModule('xdc.runtime.System'); var System = xdc.useModule('xdc.runtime.System');
var Text = xdc.useModule('xdc.runtime.Text'); var Text = xdc.useModule('xdc.runtime.Text');
var TimeStamp = xdc.useModule('xdc.runtime.Timestamp'); var Timestamp = xdc.useModule('xdc.runtime.Timestamp');
var BIOS = xdc.useModule('ti.sysbios.BIOS'); var BIOS = xdc.useModule('ti.sysbios.BIOS');
var Clock = xdc.useModule('ti.sysbios.knl.Clock'); var Clock = xdc.useModule('ti.sysbios.knl.Clock');
@ -21,9 +21,20 @@ var Hwi = xdc.useModule('ti.sysbios.hal.Hwi');
var HeapMem = xdc.useModule('ti.sysbios.heaps.HeapMem'); var HeapMem = xdc.useModule('ti.sysbios.heaps.HeapMem');
var Timer = xdc.useModule('ti.sysbios.hal.Timer'); var Timer = xdc.useModule('ti.sysbios.hal.Timer');
BIOS.heapSize = 100000; BIOS.heapSize = 86016;
Task.idleTaskStackSize = 768; Task.idleTaskStackSize = 768;
/*
* Program.stack is ignored with IAR. Use the project options in
* IAR Embedded Workbench to alter the system stack size.
*/
if (!Program.build.target.$name.match(/iar/)) {
/*
* Reducing the system stack size (used by ISRs and Swis) to reduce
* RAM usage.
*/
Program.stack = 2048; Program.stack = 2048;
}
/* ================ System configuration ================ */ /* ================ System configuration ================ */
var SysMin = xdc.useModule('xdc.runtime.SysMin'); var SysMin = xdc.useModule('xdc.runtime.SysMin');
@ -38,8 +49,6 @@ if (Program.build.target.$name.match(/gnu/)) {
/* ================ NDK configuration ================ */ /* ================ NDK configuration ================ */
var Ndk = xdc.loadPackage('ti.ndk.config'); var Ndk = xdc.loadPackage('ti.ndk.config');
var Global = xdc.useModule('ti.ndk.config.Global'); var Global = xdc.useModule('ti.ndk.config.Global');
var Ip = xdc.useModule('ti.ndk.config.Ip');
var Udp = xdc.useModule('ti.ndk.config.Udp');
var Tcp = xdc.useModule('ti.ndk.config.Tcp'); var Tcp = xdc.useModule('ti.ndk.config.Tcp');
Global.IPv6 = false; Global.IPv6 = false;
@ -57,11 +66,8 @@ Tcp.receiveBufSize = 1024;
/* ================ Driver configuration ================ */ /* ================ Driver configuration ================ */
var TIRTOS = xdc.useModule('ti.tirtos.TIRTOS'); var TIRTOS = xdc.useModule('ti.tirtos.TIRTOS');
TIRTOS.useEMAC = true;
var EMAC = xdc.useModule('ti.drivers.EMAC'); TIRTOS.useGPIO = true;
EMAC.libType = EMAC.LibType_NonInstrumented;
var GPIO = xdc.useModule('ti.drivers.GPIO');
GPIO.libType = GPIO.LibType_NonInstrumented;
/* ================ CyaSSL configuration ================ */ /* ================ CyaSSL configuration ================ */
try { try {

View File

@ -16,7 +16,7 @@ Pkg.makePrologue = "vpath %.c $(subst ;, ,$(XPKGPATH))";
var srcs = [ var srcs = [
"main.c", "main.c",
"ctaocrypt/benchmark/benchmark.c", "ctaocrypt/benchmark/benchmark.c",
"examples/EK_TM4C1294XL/EK_TM4C1294XL.c", "examples/boards/EK_TM4C1294XL/EK_TM4C1294XL.c",
]; ];
for each (var targ in Build.targets) { for each (var targ in Build.targets) {
@ -37,7 +37,8 @@ for each (var targ in Build.targets) {
targ.$orig.lnkOpts.suffix = suffix.replace(/PrintfSmall/, "PrintfFull"); targ.$orig.lnkOpts.suffix = suffix.replace(/PrintfSmall/, "PrintfFull");
} }
else if (targ.$name.match(/^gnu/)) { else if (targ.$name.match(/^gnu/)) {
targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc " + " -Wl,--start-group -ldriver -Wl,--end-group "; targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc "
+ " -Wl,--start-group -ldriver -Wl,--end-group ";
targ.$orig.bspLib = "rdimon"; targ.$orig.bspLib = "rdimon";
} }
@ -47,7 +48,6 @@ for each (var targ in Build.targets) {
lopts: lnkOpts lopts: lnkOpts
}; };
var exe = Pkg.addExecutable("benchmark", targ, var exe = Pkg.addExecutable("benchmark", targ, platform, exeOptions);
platform, exeOptions);
exe.addObjects(srcs); exe.addObjects(srcs);
} }

View File

@ -16,7 +16,7 @@ Pkg.makePrologue = "vpath %.c $(subst ;, ,$(XPKGPATH))";
var srcs = [ var srcs = [
"main.c", "main.c",
"ctaocrypt/test/test.c", "ctaocrypt/test/test.c",
"examples/EK_TM4C1294XL/EK_TM4C1294XL.c", "examples/boards/EK_TM4C1294XL/EK_TM4C1294XL.c",
]; ];
for each (var targ in Build.targets) { for each (var targ in Build.targets) {
@ -33,7 +33,8 @@ for each (var targ in Build.targets) {
platform = "ti.platforms.tiva:TM4C1294NCPDT"; platform = "ti.platforms.tiva:TM4C1294NCPDT";
} }
else if (targ.$name.match(/^gnu/)) { else if (targ.$name.match(/^gnu/)) {
targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc " + " -Wl,--start-group -ldriver -Wl,--end-group "; targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc "
+ " -Wl,--start-group -ldriver -Wl,--end-group ";
targ.$orig.bspLib = "rdimon"; targ.$orig.bspLib = "rdimon";
} }
@ -43,7 +44,6 @@ for each (var targ in Build.targets) {
lopts: lnkOpts, lopts: lnkOpts,
}; };
var exe = Pkg.addExecutable("test", targ, var exe = Pkg.addExecutable("test", targ, platform, exeOptions);
platform, exeOptions);
exe.addObjects(srcs); exe.addObjects(srcs);
} }

View File

@ -11,7 +11,7 @@ var Main = xdc.useModule('xdc.runtime.Main');
var Memory = xdc.useModule('xdc.runtime.Memory'); var Memory = xdc.useModule('xdc.runtime.Memory');
var System = xdc.useModule('xdc.runtime.System'); var System = xdc.useModule('xdc.runtime.System');
var Text = xdc.useModule('xdc.runtime.Text'); var Text = xdc.useModule('xdc.runtime.Text');
var TimeStamp = xdc.useModule('xdc.runtime.Timestamp'); var Timestamp = xdc.useModule('xdc.runtime.Timestamp');
var BIOS = xdc.useModule('ti.sysbios.BIOS'); var BIOS = xdc.useModule('ti.sysbios.BIOS');
var Clock = xdc.useModule('ti.sysbios.knl.Clock'); var Clock = xdc.useModule('ti.sysbios.knl.Clock');
@ -19,11 +19,21 @@ var Task = xdc.useModule('ti.sysbios.knl.Task');
var Semaphore = xdc.useModule('ti.sysbios.knl.Semaphore'); var Semaphore = xdc.useModule('ti.sysbios.knl.Semaphore');
var Hwi = xdc.useModule('ti.sysbios.hal.Hwi'); var Hwi = xdc.useModule('ti.sysbios.hal.Hwi');
var HeapMem = xdc.useModule('ti.sysbios.heaps.HeapMem'); var HeapMem = xdc.useModule('ti.sysbios.heaps.HeapMem');
var Timer = xdc.useModule('ti.sysbios.hal.Timer');
BIOS.heapSize = 100000; BIOS.heapSize = 86016;
Task.idleTaskStackSize = 768; Task.idleTaskStackSize = 768;
/*
* Program.stack is ignored with IAR. Use the project options in
* IAR Embedded Workbench to alter the system stack size.
*/
if (!Program.build.target.$name.match(/iar/)) {
/*
* Reducing the system stack size (used by ISRs and Swis) to reduce
* RAM usage.
*/
Program.stack = 2048; Program.stack = 2048;
}
/* ================ System configuration ================ */ /* ================ System configuration ================ */
var SysMin = xdc.useModule('xdc.runtime.SysMin'); var SysMin = xdc.useModule('xdc.runtime.SysMin');
@ -38,8 +48,6 @@ if (Program.build.target.$name.match(/gnu/)) {
/* ================ NDK configuration ================ */ /* ================ NDK configuration ================ */
var Ndk = xdc.loadPackage('ti.ndk.config'); var Ndk = xdc.loadPackage('ti.ndk.config');
var Global = xdc.useModule('ti.ndk.config.Global'); var Global = xdc.useModule('ti.ndk.config.Global');
var Ip = xdc.useModule('ti.ndk.config.Ip');
var Udp = xdc.useModule('ti.ndk.config.Udp');
var Tcp = xdc.useModule('ti.ndk.config.Tcp'); var Tcp = xdc.useModule('ti.ndk.config.Tcp');
Global.IPv6 = false; Global.IPv6 = false;
@ -57,11 +65,8 @@ Tcp.receiveBufSize = 1024;
/* ================ Driver configuration ================ */ /* ================ Driver configuration ================ */
var TIRTOS = xdc.useModule('ti.tirtos.TIRTOS'); var TIRTOS = xdc.useModule('ti.tirtos.TIRTOS');
TIRTOS.useEMAC = true;
var EMAC = xdc.useModule('ti.drivers.EMAC'); TIRTOS.useGPIO = true;
EMAC.libType = EMAC.LibType_NonInstrumented;
var GPIO = xdc.useModule('ti.drivers.GPIO');
GPIO.libType = GPIO.LibType_NonInstrumented;
/* ================ CyaSSL configuration ================ */ /* ================ CyaSSL configuration ================ */
try { try {