diff options
author | Mahesh Radhakrishnan | 2019-08-02 10:25:40 -0500 |
---|---|---|
committer | Mahesh Radhakrishnan | 2019-08-02 10:25:40 -0500 |
commit | d9b51bfc77ee0c97ed11dc6753667cfadc0285f6 (patch) | |
tree | 36bb9717bc40b9b485c31958c10e6cd69d74476e | |
parent | 10d3fbc0231073027991d797e9406a9585058691 (diff) | |
parent | c56a1b97011a241738fc4c56e03e40f02e8cc69f (diff) | |
download | cppi-lld-d9b51bfc77ee0c97ed11dc6753667cfadc0285f6.tar.gz cppi-lld-d9b51bfc77ee0c97ed11dc6753667cfadc0285f6.tar.xz cppi-lld-d9b51bfc77ee0c97ed11dc6753667cfadc0285f6.zip |
Merge pull request #4 in PROCESSOR-SDK/cppi-lld from CATREQ-2702 to masterDEV.CPPI_LLD.02.02.00.14ADEV.CPPI_LLD.02.02.00.01ADEV.CPPI_LLD.02.01.00.14A
* commit 'c56a1b97011a241738fc4c56e03e40f02e8cc69f':
CATREQ-2702: Descoping C6x big_endian due to sysbios upgrade
-rwxr-xr-x | build/buildlib.xs | 16 | ||||
-rw-r--r-- | config.bld | 74 | ||||
-rw-r--r-- | package.bld | 4 |
3 files changed, 35 insertions, 59 deletions
diff --git a/build/buildlib.xs b/build/buildlib.xs index f2ab6f3..ac45785 100755 --- a/build/buildlib.xs +++ b/build/buildlib.xs | |||
@@ -236,12 +236,6 @@ function createLibMake(device, makelibname,targetname, objectPath) | |||
236 | targetDir="c66"; | 236 | targetDir="c66"; |
237 | targetname=C66LE; | 237 | targetname=C66LE; |
238 | break; | 238 | break; |
239 | case String(C66BE): | ||
240 | tooldir="C6X_GEN_INSTALL_PATH"; | ||
241 | cmdprefix=""; | ||
242 | targetDir="c66"; | ||
243 | targetname=C66BE; | ||
244 | break; | ||
245 | case String(A15LE): | 239 | case String(A15LE): |
246 | tooldir="TOOLCHAIN_PATH_A15"; | 240 | tooldir="TOOLCHAIN_PATH_A15"; |
247 | cmdprefix="CROSS_TOOL_PRFX"; | 241 | cmdprefix="CROSS_TOOL_PRFX"; |
@@ -466,13 +460,13 @@ function makeAddObjects(srcString, makefilename, srcfiles, flags,fileExt, target | |||
466 | * Utility function which will build a specific library | 460 | * Utility function which will build a specific library |
467 | **************************************************************************/ | 461 | **************************************************************************/ |
468 | var makefilelocal; | 462 | var makefilelocal; |
469 | 463 | ||
470 | function buildLibrary (socName, isSoc, libOptions, libName, target, libFiles) | 464 | function buildLibrary (socName, isSoc, libOptions, libName, target, libFiles) |
471 | { | 465 | { |
472 | var targetDir; | 466 | var targetDir; |
473 | var objExtDir; | 467 | var objExtDir; |
474 | 468 | ||
475 | 469 | ||
476 | if (target.name == "A15F") | 470 | if (target.name == "A15F") |
477 | { | 471 | { |
478 | targetDir = "armv7"; | 472 | targetDir = "armv7"; |
@@ -482,7 +476,7 @@ function buildLibrary (socName, isSoc, libOptions, libName, target, libFiles) | |||
482 | targetDir = "armv7"; | 476 | targetDir = "armv7"; |
483 | } | 477 | } |
484 | else if (target.name == "A8F") | 478 | else if (target.name == "A8F") |
485 | 479 | ||
486 | { | 480 | { |
487 | targetDir = "armv7"; | 481 | targetDir = "armv7"; |
488 | } | 482 | } |
@@ -505,8 +499,8 @@ function buildLibrary (socName, isSoc, libOptions, libName, target, libFiles) | |||
505 | var libNameExp = libName; | 499 | var libNameExp = libName; |
506 | objExtDir = "all"; | 500 | objExtDir = "all"; |
507 | } | 501 | } |
508 | 502 | ||
509 | 503 | ||
510 | var lldFullLibraryPath = "./lib/" + targetDir +"/" + libNameExp; | 504 | var lldFullLibraryPath = "./lib/" + targetDir +"/" + libNameExp; |
511 | var lldFullBuildPath = "./build/" + targetDir +"/" + libNameExp; | 505 | var lldFullBuildPath = "./build/" + targetDir +"/" + libNameExp; |
512 | var lldFullLibraryPathMake = "$(LIBDIR)/" + targetDir +"/" + libNameExp; | 506 | var lldFullLibraryPathMake = "$(LIBDIR)/" + targetDir +"/" + libNameExp; |
@@ -57,16 +57,9 @@ var lldCoverityAnalysis = java.lang.System.getenv("LLDCOV"); | |||
57 | var C66LE = xdc.useModule('ti.targets.elf.C66'); | 57 | var C66LE = xdc.useModule('ti.targets.elf.C66'); |
58 | C66LE.rootDir = c66ToolsBaseDir; | 58 | C66LE.rootDir = c66ToolsBaseDir; |
59 | C66LE.ccOpts.prefix = "-mo -o3 -q -k -eo.o"; | 59 | C66LE.ccOpts.prefix = "-mo -o3 -q -k -eo.o"; |
60 | if(extDbgFlags) | 60 | if(extDbgFlags) |
61 | C66LE.ccOpts.prefix = C66LE.ccOpts.prefix + " " + extDbgFlags; | 61 | C66LE.ccOpts.prefix = C66LE.ccOpts.prefix + " " + extDbgFlags; |
62 | 62 | ||
63 | /* C66Plus ELF compiler configuration for Big Endian Mode. */ | ||
64 | var C66BE = xdc.useModule('ti.targets.elf.C66_big_endian'); | ||
65 | C66BE.rootDir = c66ToolsBaseDir; | ||
66 | C66BE.ccOpts.prefix = "-mo -o3 -q -k -eo.o -DBIGENDIAN"; | ||
67 | if(extDbgFlags) | ||
68 | C66BE.ccOpts.prefix = C66BE.ccOpts.prefix + " " + extDbgFlags; | ||
69 | |||
70 | /* ARMv7 A15 compiler configuration */ | 63 | /* ARMv7 A15 compiler configuration */ |
71 | var A15LE = xdc.useModule('gnu.targets.arm.A15F'); | 64 | var A15LE = xdc.useModule('gnu.targets.arm.A15F'); |
72 | A15LE.rootDir = a15ToolsBaseDir; | 65 | A15LE.rootDir = a15ToolsBaseDir; |
@@ -135,15 +128,6 @@ if (miniBuild == "ON") | |||
135 | 128 | ||
136 | C66LE.profiles["release"].filters[C66LE.profiles["release"].filters.length++] = makeC66LEFilter; | 129 | C66LE.profiles["release"].filters[C66LE.profiles["release"].filters.length++] = makeC66LEFilter; |
137 | 130 | ||
138 | var makeC66BEFilter = { | ||
139 | moduleName: "build.filter.Make", | ||
140 | params: { | ||
141 | makefileName: "simpleC66BE.mak", | ||
142 | } | ||
143 | }; | ||
144 | |||
145 | C66BE.profiles["release"].filters[C66BE.profiles["release"].filters.length++] = makeC66BEFilter; | ||
146 | |||
147 | } | 131 | } |
148 | 132 | ||
149 | /* soc name (am?) is inserted between first an second element of this | 133 | /* soc name (am?) is inserted between first an second element of this |
@@ -173,7 +157,7 @@ var socs = { | |||
173 | /* Library options */ | 157 | /* Library options */ |
174 | copts: " -DSOC_K2G", | 158 | copts: " -DSOC_K2G", |
175 | /* target list */ | 159 | /* target list */ |
176 | targets: [ C66LE, C66BE, A15LE] | 160 | targets: [ C66LE, A15LE] |
177 | }, | 161 | }, |
178 | k2h : | 162 | k2h : |
179 | { | 163 | { |
@@ -184,7 +168,7 @@ var socs = { | |||
184 | /* Library options */ | 168 | /* Library options */ |
185 | copts: " -DSOC_K2H", | 169 | copts: " -DSOC_K2H", |
186 | /* target list */ | 170 | /* target list */ |
187 | targets: [ C66LE, C66BE, A15LE] | 171 | targets: [ C66LE, A15LE] |
188 | }, | 172 | }, |
189 | k2k : | 173 | k2k : |
190 | { | 174 | { |
@@ -195,7 +179,7 @@ var socs = { | |||
195 | /* dma lib enabled */ | 179 | /* dma lib enabled */ |
196 | copts: " -DSOC_K2K", | 180 | copts: " -DSOC_K2K", |
197 | /* target list */ | 181 | /* target list */ |
198 | targets: [ C66LE, C66BE, A15LE] | 182 | targets: [ C66LE, A15LE] |
199 | }, | 183 | }, |
200 | k2e : | 184 | k2e : |
201 | { | 185 | { |
@@ -206,7 +190,7 @@ var socs = { | |||
206 | /* Library options */ | 190 | /* Library options */ |
207 | copts: " -DSOC_K2E", | 191 | copts: " -DSOC_K2E", |
208 | /* target list */ | 192 | /* target list */ |
209 | targets: [ C66LE, C66BE, A15LE] | 193 | targets: [ C66LE, A15LE] |
210 | }, | 194 | }, |
211 | k2l : | 195 | k2l : |
212 | { | 196 | { |
@@ -217,29 +201,29 @@ var socs = { | |||
217 | /* Library options */ | 201 | /* Library options */ |
218 | copts: " -DSOC_K2L", | 202 | copts: " -DSOC_K2L", |
219 | /* target list */ | 203 | /* target list */ |
220 | targets: [ C66LE, C66BE, A15LE] | 204 | targets: [ C66LE, A15LE] |
221 | }, | 205 | }, |
222 | c6678 : | 206 | c6678 : |
223 | { | 207 | { |
224 | /* this variable would be reinitialized to true, if XDCARGS contains c6678 */ | 208 | /* this variable would be reinitialized to true, if XDCARGS contains c6678 */ |
225 | build: "false", | 209 | build: "false", |
226 | /* SoC lib enabled */ | 210 | /* SoC lib enabled */ |
227 | socDevLib: "true", | 211 | socDevLib: "true", |
228 | /* Library options */ | 212 | /* Library options */ |
229 | copts: " -DSOC_C6678", | 213 | copts: " -DSOC_C6678", |
230 | /* target list */ | 214 | /* target list */ |
231 | targets: [ C66LE, C66BE ] | 215 | targets: [ C66LE ] |
232 | }, | 216 | }, |
233 | c6657 : | 217 | c6657 : |
234 | { | 218 | { |
235 | /* this variable would be reinitialized to true, if XDCARGS contains c6657 */ | 219 | /* this variable would be reinitialized to true, if XDCARGS contains c6657 */ |
236 | build: "false", | 220 | build: "false", |
237 | /* SoC lib enabled */ | 221 | /* SoC lib enabled */ |
238 | socDevLib: "true", | 222 | socDevLib: "true", |
239 | /* Library options */ | 223 | /* Library options */ |
240 | copts: " -DSOC_C6657", | 224 | copts: " -DSOC_C6657", |
241 | /* target list */ | 225 | /* target list */ |
242 | targets: [ C66LE, C66BE ] | 226 | targets: [ C66LE ] |
243 | } | 227 | } |
244 | }; | 228 | }; |
245 | 229 | ||
@@ -308,4 +292,4 @@ for (var i=0; i < buildArguments.length; i++ ) { | |||
308 | /* Update the Build target generated list */ | 292 | /* Update the Build target generated list */ |
309 | socs["all"].targets = build_targets; | 293 | socs["all"].targets = build_targets; |
310 | Build.targets = build_targets; | 294 | Build.targets = build_targets; |
311 | 295 | ||
diff --git a/package.bld b/package.bld index f7c50bb..3f8e83e 100644 --- a/package.bld +++ b/package.bld | |||
@@ -53,7 +53,6 @@ print ("A15 Tools Directory : " + a15ToolsBaseDir); | |||
53 | print ("RTSC File Name : " + lldRTSCFileName); | 53 | print ("RTSC File Name : " + lldRTSCFileName); |
54 | print ("CPPI LLD Path : " + lldPath); | 54 | print ("CPPI LLD Path : " + lldPath); |
55 | print ("CC LE opts : " + C66LE.ccOpts.prefix); | 55 | print ("CC LE opts : " + C66LE.ccOpts.prefix); |
56 | print ("CC BE opts : " + C66BE.ccOpts.prefix); | ||
57 | print ("M4 LE opts : " + M4LE.ccOpts.prefix); | 56 | print ("M4 LE opts : " + M4LE.ccOpts.prefix); |
58 | print ("A15 basic opts : " + A15LE.ccOpts.prefix); | 57 | print ("A15 basic opts : " + A15LE.ccOpts.prefix); |
59 | print ("***********************************************************"); | 58 | print ("***********************************************************"); |
@@ -114,7 +113,7 @@ tplt.genFile("./Settings.xdc",lldReleaseVersion); | |||
114 | /* Generate cppiver.h */ | 113 | /* Generate cppiver.h */ |
115 | var tplt = xdc.loadTemplate("./cppiver.h.xdt"); | 114 | var tplt = xdc.loadTemplate("./cppiver.h.xdt"); |
116 | tplt.genFile("./cppiver.h",lldReleaseVersion); | 115 | tplt.genFile("./cppiver.h",lldReleaseVersion); |
117 | 116 | ||
118 | /* Check if we need to create the mini package? */ | 117 | /* Check if we need to create the mini package? */ |
119 | var miniBuild = java.lang.System.getenv("MINI_PACKAGE"); | 118 | var miniBuild = java.lang.System.getenv("MINI_PACKAGE"); |
120 | 119 | ||
@@ -195,5 +194,4 @@ if (lldInstallType == "SETUP") | |||
195 | if (miniBuild == "ON") | 194 | if (miniBuild == "ON") |
196 | { | 195 | { |
197 | Pkg.makeEpilogue += "\t -$(RM) simpleC66LE.mak\n"; | 196 | Pkg.makeEpilogue += "\t -$(RM) simpleC66LE.mak\n"; |
198 | Pkg.makeEpilogue += "\t -$(RM) simpleC66BE.mak\n"; | ||
199 | } | 197 | } |