Skip to content

Commit 1f9d283

Browse files
0xc01700xc0170
authored
Merge pull request #1924 from 0xc0170/fix_armcc
Fix armcc ulib template - removal
2 parents cfa4d0c + 269697d commit 1f9d283

File tree

3 files changed

+24
-503
lines changed

3 files changed

+24
-503
lines changed

‎hal/targets.json‎

Lines changed: 23 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@
6060
"extra_labels": ["NXP", "LPC11XX_11CXX", "LPC11XX"],
6161
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
6262
"progen": {
63-
"target": "lpc1114_102",
64-
"uvision": {
65-
"template": ["uvision_microlib.uvproj.tmpl"]
66-
}
63+
"target": "lpc1114_102"
6764
},
6865
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
6966
"default_build": "small"
@@ -75,10 +72,7 @@
7572
"extra_labels": ["NXP", "LPC11UXX", "LPC11U24_401"],
7673
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
7774
"progen": {
78-
"target": "lpc11u24_201",
79-
"uvision": {
80-
"template": ["uvision_microlib.uvproj.tmpl"]
81-
}
75+
"target": "lpc11u24_201"
8276
},
8377
"detect_code": ["1040"],
8478
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOCALFILESYSTEM", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SEMIHOST", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
@@ -88,10 +82,7 @@
8882
"inherits": ["LPC11U24"],
8983
"macros": ["TARGET_LPC11U24"],
9084
"progen": {
91-
"target": "lpc11u24_201",
92-
"uvision": {
93-
"template": ["uvision_microlib.uvproj.tmpl"]
94-
}
85+
"target": "lpc11u24_201"
9586
},
9687
"extra_labels": ["NXP", "LPC11UXX"],
9788
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
@@ -124,10 +115,7 @@
124115
"extra_labels": ["NXP", "LPC11UXX"],
125116
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
126117
"progen": {
127-
"target": "lpc11u35_401",
128-
"uvision": {
129-
"template": ["uvision_microlib.uvproj.tmpl"]
130-
}
118+
"target": "lpc11u35_401"
131119
},
132120
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
133121
"default_build": "small"
@@ -139,10 +127,7 @@
139127
"extra_labels": ["NXP", "LPC11UXX", "MCU_LPC11U35_501"],
140128
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
141129
"progen": {
142-
"target": "lpc11u35_501",
143-
"uvision": {
144-
"template": ["uvision_microlib.uvproj.tmpl"]
145-
}
130+
"target": "lpc11u35_501"
146131
},
147132
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
148133
"default_build": "small"
@@ -154,10 +139,7 @@
154139
"extra_labels": ["NXP", "LPC11UXX", "MCU_LPC11U35_501"],
155140
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
156141
"progen": {
157-
"target": "lpc11u35_501",
158-
"uvision": {
159-
"template": ["uvision_microlib.uvproj.tmpl"]
160-
}
142+
"target": "lpc11u35_501"
161143
},
162144
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
163145
"default_build": "small"
@@ -169,10 +151,7 @@
169151
"extra_labels": ["NXP", "LPC11UXX", "MCU_LPC11U35_501"],
170152
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
171153
"progen": {
172-
"target": "lpc11u35_501",
173-
"uvision": {
174-
"template": ["uvision_microlib.uvproj.tmpl"]
175-
}
154+
"target": "lpc11u35_501"
176155
},
177156
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
178157
"default_build": "small"
@@ -184,10 +163,7 @@
184163
"extra_labels": ["NXP", "LPC11UXX", "MCU_LPC11U35_501"],
185164
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
186165
"progen": {
187-
"target": "lpc11u35_501",
188-
"uvision": {
189-
"template": ["uvision_microlib.uvproj.tmpl"]
190-
}
166+
"target": "lpc11u35_501"
191167
},
192168
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
193169
"default_build": "small"
@@ -199,20 +175,14 @@
199175
"extra_labels": ["NXP", "LPC11UXX"],
200176
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
201177
"progen": {
202-
"target": "lpc11u37_501",
203-
"uvision": {
204-
"template": ["uvision_microlib.uvproj.tmpl"]
205-
}
178+
"target": "lpc11u37_501"
206179
},
207180
"default_build": "small"
208181
},
209182
"LPCCAPPUCCINO": {
210183
"inherits": ["LPC11U37_501"],
211184
"progen": {
212-
"target": "lpc11u37_501",
213-
"uvision": {
214-
"template": ["uvision_microlib.uvproj.tmpl"]
215-
}
185+
"target": "lpc11u37_501"
216186
},
217187
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"]
218188
},
@@ -224,10 +194,7 @@
224194
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
225195
"inherits": ["LPCTarget"],
226196
"progen": {
227-
"target": "lpc11u37_501",
228-
"uvision": {
229-
"template": ["uvision_microlib.uvproj.tmpl"]
230-
}
197+
"target": "lpc11u37_501"
231198
},
232199
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
233200
"default_build": "small"
@@ -240,10 +207,7 @@
240207
"supported_toolchains": ["ARM", "uARM", "GCC_CR", "GCC_ARM", "IAR"],
241208
"inherits": ["LPCTarget"],
242209
"progen": {
243-
"target": "lpc11u68",
244-
"uvision": {
245-
"template": ["uvision_microlib.uvproj.tmpl"]
246-
}
210+
"target": "lpc11u68"
247211
},
248212
"detect_code": ["1168"],
249213
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI"],
@@ -265,10 +229,7 @@
265229
"supported_toolchains": ["uARM", "GCC_CR", "GCC_ARM", "IAR"],
266230
"inherits": ["LPCTarget"],
267231
"progen": {
268-
"target": "lpc1549",
269-
"uvision": {
270-
"template": ["uvision_microlib.uvproj.tmpl"]
271-
}
232+
"target": "lpc1549"
272233
},
273234
"detect_code": ["1549"],
274235
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "INTERRUPTIN", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE"],
@@ -337,10 +298,7 @@
337298
"is_disk_virtual": true,
338299
"supported_toolchains": ["uARM", "IAR", "GCC_ARM"],
339300
"progen": {
340-
"target": "lpc810",
341-
"uvision": {
342-
"template": ["uvision_microlib.uvproj.tmpl"]
343-
}
301+
"target": "lpc810"
344302
},
345303
"device_has": ["ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE"],
346304
"default_build": "small"
@@ -354,10 +312,7 @@
354312
"supported_toolchains": ["uARM", "IAR", "GCC_ARM"],
355313
"inherits": ["LPCTarget"],
356314
"progen": {
357-
"target": "lpc812m101",
358-
"uvision": {
359-
"template": ["uvision_microlib.uvproj.tmpl"]
360-
}
315+
"target": "lpc812m101"
361316
},
362317
"detect_code": ["1050"],
363318
"device_has": ["ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE"],
@@ -372,10 +327,7 @@
372327
"supported_toolchains": ["uARM", "GCC_ARM", "GCC_CR", "IAR"],
373328
"inherits": ["LPCTarget"],
374329
"progen": {
375-
"target": "lpc824m201",
376-
"uvision": {
377-
"template": ["uvision_microlib.uvproj.tmpl"]
378-
}
330+
"target": "lpc824m201"
379331
},
380332
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
381333
"default_build": "small"
@@ -388,10 +340,7 @@
388340
"is_disk_virtual": true,
389341
"supported_toolchains": ["uARM", "GCC_ARM"],
390342
"progen": {
391-
"target": "ssci824",
392-
"uvision": {
393-
"template": ["uvision_microlib.uvproj.tmpl"]
394-
}
343+
"target": "ssci824"
395344
},
396345
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
397346
"default_build": "small"
@@ -450,10 +399,7 @@
450399
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR"],
451400
"inherits": ["LPCTarget"],
452401
"progen": {
453-
"target": "lpc11u37_401",
454-
"uvision": {
455-
"template": ["uvision_microlib.uvproj.tmpl"]
456-
}
402+
"target": "lpc11u37_401"
457403
},
458404
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
459405
"default_build": "small"
@@ -467,10 +413,7 @@
467413
"is_disk_virtual": true,
468414
"detect_code": ["C000"],
469415
"progen": {
470-
"target": "cocorico",
471-
"uvision": {
472-
"template": ["uvision_microlib.uvproj.tmpl"]
473-
}
416+
"target": "cocorico"
474417
},
475418
"default_build": "small"
476419
},
@@ -483,10 +426,7 @@
483426
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
484427
"inherits": ["Target"],
485428
"progen": {
486-
"target": "frdm-kl05z",
487-
"uvision": {
488-
"template": ["uvision_microlib.uvproj.tmpl"]
489-
}
429+
"target": "frdm-kl05z"
490430
},
491431
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SEMIHOST", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
492432
"default_build": "small"
@@ -1627,10 +1567,7 @@
16271567
"extra_labels": ["Silicon_Labs", "EFM32"],
16281568
"macros": ["EFM32ZG222F32"],
16291569
"progen": {
1630-
"target": "efm32zg-stk",
1631-
"uvision": {
1632-
"template": ["uvision_microlib.uvproj.tmpl"]
1633-
}
1570+
"target": "efm32zg-stk"
16341571
},
16351572
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
16361573
"default_build": "small"
@@ -1643,10 +1580,7 @@
16431580
"extra_labels": ["Silicon_Labs", "EFM32"],
16441581
"macros": ["EFM32HG322F64"],
16451582
"progen": {
1646-
"target": "efm32hg-stk",
1647-
"uvision": {
1648-
"template": ["uvision_microlib.uvproj.tmpl"]
1649-
}
1583+
"target": "efm32hg-stk"
16501584
},
16511585
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
16521586
"default_build": "small"
@@ -1735,4 +1669,4 @@
17351669
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH"],
17361670
"default_build": "standard"
17371671
}
1738-
}
1672+
}

‎tools/export/uvision.uvproj.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@
347347
<uSurpInc>0</uSurpInc>
348348
<uC99>1</uC99>
349349
<VariousControls>
350-
<MiscControls>--gnu --no_rtti</MiscControls>
350+
<MiscControls></MiscControls>
351351
<Define> </Define>
352352
<Undefine></Undefine>
353353
<IncludePath> </IncludePath>

0 commit comments

Comments
 (0)