diff options
author | Aravind Batni | 2019-08-05 13:21:14 -0500 |
---|---|---|
committer | Aravind Batni | 2019-08-05 13:21:14 -0500 |
commit | 7ca6e92b2081bd2eb64fa3dc9ca33df78b3ce292 (patch) | |
tree | 5a870c95f14f4701e3eb85ecaeada950d81ed830 | |
parent | 7934ae59f545b302ede96482e61a1f79ff3518ce (diff) | |
parent | 9720168e11dc5a0f88afa76cfd020a02b11b33b5 (diff) | |
download | qmss-lld-7ca6e92b2081bd2eb64fa3dc9ca33df78b3ce292.tar.gz qmss-lld-7ca6e92b2081bd2eb64fa3dc9ca33df78b3ce292.tar.xz qmss-lld-7ca6e92b2081bd2eb64fa3dc9ca33df78b3ce292.zip |
Merge pull request #6 in PROCESSOR-SDK/qmss-lld from CATREQ-2702 to masterDEV.QMSS_LLD.02.02.00.01ADEV.QMSS_LLD.02.01.00.16A
* commit '9720168e11dc5a0f88afa76cfd020a02b11b33b5':
Descoping c66BE
CATREQ-2702: Descope c6x big endian targets due to sysbios 6.75
-rw-r--r-- | build/buildlib.xs | 10 | ||||
-rwxr-xr-x | config.bld | 30 | ||||
-rw-r--r-- | package.bld | 2 |
3 files changed, 9 insertions, 33 deletions
diff --git a/build/buildlib.xs b/build/buildlib.xs index 89b4442..fd5eebb 100644 --- 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"; |
@@ -467,7 +461,7 @@ function makeAddObjects(srcString, makefilename, srcfiles, flags,fileExt, target | |||
467 | * Utility function which will build a specific library | 461 | * Utility function which will build a specific library |
468 | **************************************************************************/ | 462 | **************************************************************************/ |
469 | var makefilelocal; | 463 | var makefilelocal; |
470 | 464 | ||
471 | function buildLibrary (socName, isSoc, libOptions, libName, target, libFiles) | 465 | function buildLibrary (socName, isSoc, libOptions, libName, target, libFiles) |
472 | { | 466 | { |
473 | var targetDir; | 467 | var targetDir; |
@@ -617,4 +611,4 @@ function buildLibrary (socName, isSoc, libOptions, libName, target, libFiles) | |||
617 | Pkg.makeEpilogue += "\t$(RMDIR) " + "$(LIBDIR)/" + targetDir + "/ \n\n"; | 611 | Pkg.makeEpilogue += "\t$(RMDIR) " + "$(LIBDIR)/" + targetDir + "/ \n\n"; |
618 | 612 | ||
619 | return lib; | 613 | return lib; |
620 | } | 614 | } |
@@ -60,13 +60,6 @@ C66LE.ccOpts.prefix = "-mo -o3 -q -k -eo.o --mem_model:data=far"; | |||
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 | /* C66 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 --mem_model:data=far -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_K2H", | 158 | copts: " -DSOC_K2H", |
175 | /* target list */ | 159 | /* target list */ |
176 | targets: [ C66LE, C66BE, A15LE] | 160 | targets: [ C66LE, A15LE] |
177 | }, | 161 | }, |
178 | k2g : | 162 | k2g : |
179 | { | 163 | { |
@@ -184,7 +168,7 @@ var socs = { | |||
184 | /* Library options */ | 168 | /* Library options */ |
185 | copts: " -DSOC_K2G", | 169 | copts: " -DSOC_K2G", |
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,7 +201,7 @@ 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 | { |
@@ -228,7 +212,7 @@ var socs = { | |||
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 | { |
@@ -239,7 +223,7 @@ var socs = { | |||
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 | ||
diff --git a/package.bld b/package.bld index fb85696..b9d5109 100644 --- a/package.bld +++ b/package.bld | |||
@@ -57,7 +57,6 @@ print ("A15 Tools Directory : " + a15ToolsBaseDir); | |||
57 | print ("RTSC File Name : " + lldRTSCFileName); | 57 | print ("RTSC File Name : " + lldRTSCFileName); |
58 | print ("QMSS LLD Path : " + lldPath); | 58 | print ("QMSS LLD Path : " + lldPath); |
59 | print ("CC LE opts : " + C66LE.ccOpts.prefix); | 59 | print ("CC LE opts : " + C66LE.ccOpts.prefix); |
60 | print ("CC BE opts : " + C66BE.ccOpts.prefix); | ||
61 | print ("M4 LE opts : " + M4LE.ccOpts.prefix); | 60 | print ("M4 LE opts : " + M4LE.ccOpts.prefix); |
62 | print ("A15 basic opts : " + A15LE.ccOpts.prefix); | 61 | print ("A15 basic opts : " + A15LE.ccOpts.prefix); |
63 | print ("***********************************************************"); | 62 | print ("***********************************************************"); |
@@ -203,5 +202,4 @@ if (lldInstallType == "SETUP") | |||
203 | if (miniBuild == "ON") | 202 | if (miniBuild == "ON") |
204 | { | 203 | { |
205 | Pkg.makeEpilogue += "\t -$(RM) simpleC66LE.mak\n"; | 204 | Pkg.makeEpilogue += "\t -$(RM) simpleC66LE.mak\n"; |
206 | Pkg.makeEpilogue += "\t -$(RM) simpleC66BE.mak\n"; | ||
207 | } | 205 | } |