summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8718e2e)
raw | patch | inline | side by side (parent: 8718e2e)
author | Justin Sobota <jsobota@ti.com> | |
Fri, 20 Nov 2015 00:22:00 +0000 (19:22 -0500) | ||
committer | Justin Sobota <jsobota@ti.com> | |
Fri, 20 Nov 2015 00:22:00 +0000 (19:22 -0500) |
Signed-off-by: Justin Sobota <jsobota@ti.com>
diff --git a/build/buildlib.xs b/build/buildlib.xs
index 65e21fbd673e66a77f8b77593845b55a9155802e..42af1587f1eacaafcee48fd093b2d5450825d14b 100644 (file)
--- a/build/buildlib.xs
+++ b/build/buildlib.xs
makefile.writeLine("\n# Output for prebuilt generated libraries");
makefile.writeLine("export LIBDIR ?= ./lib");
- /* use sectti.exe from path */
+ /* use sectti from path */
makefile.writeLine("export SECTTI ?= sectti");
/* Create INCDIR from XDCPATH */
targetDir="m4";
targetname=M4LE;
break;
+ case String(ARM11):
+ tooldir="TI_ARM11_GEN_INSTALL_PATH";
+ break;
}
var fileModule = xdc.module('xdc.services.io.File');
libmakefile.writeLine("#");
libmakefile.writeLine("empty =");
libmakefile.writeLine("space =$(empty) $(empty)");
-
+
if ((targetname.name == "A15F") || (targetname.name == "A9F") || (targetname.name == "A8F"))
{
}
-
diff --git a/config.bld b/config.bld
index 17ee225a50f957e97ea578cca8d7840b2034fe12..695f848d41e1e5945b28b8b1cf3800eb51a73785 100644 (file)
--- a/config.bld
+++ b/config.bld
build: "true",
/* SoC lib enabled */
socDevLib: "false",
- /* dma lib enabled */
- dmaDevLib: "false",
/* Library options */
copts: "",
/* target lists, kept blank now, would be updated based on argument lists */
build: "false",
/* SoC lib enabled */
socDevLib: "false",
- /* dma lib enabled */
- dmaDevLib: "false",
/* Library options */
copts: " -DSOC_K2H",
/* target list */
build: "false",
/* SoC lib enabled */
socDevLib: "false",
- /* dma lib enabled */
- dmaDevLib: "false",
/* Library options */
copts: " -DSOC_K2K",
/* target list */
build: "false",
/* SoC lib enabled */
socDevLib: "false",
- /* dma lib enabled */
- dmaDevLib: "false",
/* Library options */
copts: " -DSOC_K2E",
/* target list */
build: "false",
/* SoC lib enabled */
socDevLib: "false",
- /* dma lib enabled */
- dmaDevLib: "false",
/* Library options */
copts: " -DSOC_K2L",
/* target list */
diff --git a/docs/Module.xs b/docs/Module.xs
index a87f454e7b5efb65e854fad99e8715b5832f9e19..fd1d1fba884921d7d9bda5900d1704cc1aa505b4 100644 (file)
--- a/docs/Module.xs
+++ b/docs/Module.xs
function modBuild()
{
/* Create the actual PROLOGUE Section for the Documentation.*/
+ Pkg.makePrologue += ".PHONY: WatchdogTimer_document_generation\n";
Pkg.makePrologue += "release: WatchdogTimer_document_generation\n";
- Pkg.makePrologue += "WatchdogTimer_document_generation:\n";
+ Pkg.makePrologue += "docs/doxygen/html/index.html: WatchdogTimer_document_generation\n";
+ Pkg.makePrologue += "WatchdogTimer_document_generation::\n";
Pkg.makePrologue += "\t @echo -------------------------------------------------------\n";
Pkg.makePrologue += "\t @echo Generating WatchdogTimer Documentation\n";
Pkg.makePrologue += "\t doxygen docs/Doxyfile\n";
Pkg.makePrologue += "\t @echo -------------------------------------------------------\n";
/* Add the documentation file to the package. */
- Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/WatchdogTimerDocs.chm";
Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/tifooter.htm";
Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/tiheader.htm";
Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/tilogo.gif";
index c4540e40f8280cd73adddbd11b24b8f60ebbec64..daf4ae39f7e2100a9f297d018091aabbd2d0dddc 100644 (file)
Binary files a/docs/ReleaseNotes_WatchdogTimer.doc and b/docs/ReleaseNotes_WatchdogTimer.doc differ
Binary files a/docs/ReleaseNotes_WatchdogTimer.doc and b/docs/ReleaseNotes_WatchdogTimer.doc differ
index 49e59e43a751f9b09e5ffdef3f090790a1834707..7a68ea0f02cabb8676d49ec65a2559b36b23c6dd 100644 (file)
Binary files a/docs/ReleaseNotes_WatchdogTimer.pdf and b/docs/ReleaseNotes_WatchdogTimer.pdf differ
Binary files a/docs/ReleaseNotes_WatchdogTimer.pdf and b/docs/ReleaseNotes_WatchdogTimer.pdf differ
diff --git a/docs/doxyfile.xdt b/docs/doxyfile.xdt
index bd5145d95bef359663d9694389a767a5c0dc0def..b9e2b1c042d2a2f618aafafc04ff180227d1ab5d 100644 (file)
--- a/docs/doxyfile.xdt
+++ b/docs/doxyfile.xdt
# subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = YES \
+ ./example \
./test \
./package \
./packages
diff --git a/package.bld b/package.bld
index 43097a8bf274abfd7c6ce25acbbc7a2d9461cf1f..819f8a93222a55164559afa1b9ec97de89f93620 100644 (file)
--- a/package.bld
+++ b/package.bld
print ("C66 Tools Directory : " + c66ToolsBaseDir);
print ("RTSC File Name : " + lldRTSCFileName);
print ("Watchdog Timer Path : " + lldPath);
-print ("Coverity Analysis : " + (coverityAnalysis == "ON" ? "ON" : "OFF"));
print ("CC LE opts : " + C66LE.ccOpts.prefix);
print ("CC BE opts : " + C66BE.ccOpts.prefix);
print ("***********************************************************");
Pkg.otherFiles[Pkg.otherFiles.length++] = "config.bld";
Pkg.otherFiles[Pkg.otherFiles.length++] = "package.bld";
Pkg.otherFiles[Pkg.otherFiles.length++] = "package.xdc";
+Pkg.otherFiles[Pkg.otherFiles.length++] = "package.xs";
Pkg.otherFiles[Pkg.otherFiles.length++] = "Settings.xdc";
+Pkg.otherFiles[Pkg.otherFiles.length++] = "Settings.xdc.xdt";
Pkg.otherFiles[Pkg.otherFiles.length++] = "WatchdogTimer.xdc";
Pkg.otherFiles[Pkg.otherFiles.length++] = "WatchdogTimer.xs";
Pkg.otherFiles[Pkg.otherFiles.length++] = "WatchdogTimer.h";
Pkg.otherFiles[Pkg.otherFiles.length++] = "WatchdogTimerver.h";
+Pkg.otherFiles[Pkg.otherFiles.length++] = "WatchdogTimerver.h.xdt";
Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/Doxyfile";
+Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/doxyfile.xdt";
Pkg.otherFiles[Pkg.otherFiles.length++] = "build/buildlib.xs";
-Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/ReleaseNotes_WatchdogTimer.pdf";
Pkg.otherFiles[Pkg.otherFiles.length++] = "makefile";
/* Generate Users Manual Doxyfile */
diff --git a/package.xs b/package.xs
index b78037bf0b18525b83bc494303717e4cde01849e..acc72e2cb656c1bca7a1272eafe3e8658f0a283d 100644 (file)
--- a/package.xs
+++ b/package.xs
/* Get target folder, if applicable */
if ( java.lang.String(suffix).contains('66') )
lib = lib + "/c66";
- else if ( java.lang.String(suffix).contains('m4') )
+ else if (java.lang.String(suffix).contains('a15') )
+ lib = lib + "/armv7";
+ else if (java.lang.String(suffix).contains('m4') )
lib = lib + "/m4";
+ else if (java.lang.String(suffix).contains('a9') )
+ lib = lib + "/armv7";
+ else if (java.lang.String(suffix).contains('a8') )
+ lib = lib + "/armv7";
else
- lib = lib + "/armv7";
+ throw new Error("\tUnknown target for: " + this.packageBase + lib);
/* Get library name with path */
lib = lib + "/" + name;
diff --git a/src/Module.xs b/src/Module.xs
index 03944dba74c96a2160fd60274b4816084eef2232..bc0654a830c5882f9f34bca3c12276baa2e94f9f 100644 (file)
--- a/src/Module.xs
+++ b/src/Module.xs
};
libUtility.buildLibrary (soc_names[soc], "true", libOptions, Pkg.name, dev.targets[targets], targetFiles_soc);
}
- }
+ }
}
/* Add all the .c files to the release package. */