Skip to content

Commit 5bfac71

Browse files
author
Cruz Monrreal
authored
Merge pull request #8387 from cmonr/rollup
Rollup v2.1: Rerun multiple PRs through CI that have already indirectly passed
2 parents 8dcc949 + 50e5215 commit 5bfac71

File tree

8 files changed

+27
-37
lines changed

8 files changed

+27
-37
lines changed

‎targets/targets.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"default_toolchain": "uARM",
7777
"extra_labels": ["NXP", "LPC11XX_11CXX", "LPC11XX"],
7878
"macros": ["CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
79-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
79+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
8080
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
8181
"default_lib": "small",
8282
"release_versions": ["2"],
@@ -135,7 +135,7 @@
135135
"default_toolchain": "uARM",
136136
"extra_labels": ["NXP", "LPC11UXX"],
137137
"macros": ["CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
138-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
138+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
139139
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
140140
"default_lib": "small",
141141
"release_versions": ["2"],
@@ -147,7 +147,7 @@
147147
"default_toolchain": "uARM",
148148
"extra_labels": ["NXP", "LPC11UXX", "MCU_LPC11U35_501"],
149149
"macros": ["CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
150-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
150+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
151151
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
152152
"default_lib": "small",
153153
"release_versions": ["2"],
@@ -159,7 +159,7 @@
159159
"default_toolchain": "uARM",
160160
"extra_labels": ["NXP", "LPC11UXX", "MCU_LPC11U35_501"],
161161
"macros": ["CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
162-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
162+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
163163
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
164164
"default_lib": "small",
165165
"device_name": "LPC11U35FHI33/501"
@@ -173,7 +173,7 @@
173173
"default_toolchain": "uARM",
174174
"extra_labels": ["NXP", "LPC11UXX", "MCU_LPC11U35_501"],
175175
"macros": ["CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
176-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
176+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
177177
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
178178
"default_lib": "small",
179179
"device_name": "LPC11U35FHI33/501"
@@ -184,7 +184,7 @@
184184
"default_toolchain": "uARM",
185185
"extra_labels": ["NXP", "LPC11UXX"],
186186
"macros": ["CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
187-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
187+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
188188
"default_lib": "small",
189189
"device_name": "LPC11U37FBD64/501"
190190
},
@@ -199,7 +199,7 @@
199199
"default_toolchain": "uARM",
200200
"extra_labels": ["NXP", "LPC11UXX", "LPC11U37_501"],
201201
"macros": ["CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
202-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
202+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
203203
"inherits": ["LPCTarget"],
204204
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
205205
"default_lib": "small",
@@ -211,7 +211,7 @@
211211
"core": "Cortex-M0+",
212212
"default_toolchain": "uARM",
213213
"extra_labels": ["NXP", "LPC11U6X"],
214-
"supported_toolchains": ["ARM", "uARM", "GCC_CR", "GCC_ARM", "IAR"],
214+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
215215
"inherits": ["LPCTarget"],
216216
"detect_code": ["1168"],
217217
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SLEEP", "SPI"],
@@ -233,7 +233,7 @@
233233
"core": "Cortex-M3",
234234
"default_toolchain": "uARM",
235235
"extra_labels": ["NXP", "LPC15XX"],
236-
"supported_toolchains": ["uARM", "GCC_CR", "GCC_ARM", "IAR"],
236+
"supported_toolchains": ["uARM", "GCC_ARM", "IAR"],
237237
"inherits": ["LPCTarget"],
238238
"detect_code": ["1549"],
239239
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "INTERRUPTIN", "PWMOUT", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE"],
@@ -245,7 +245,7 @@
245245
"inherits": ["LPCTarget"],
246246
"core": "Cortex-M3",
247247
"extra_labels": ["NXP", "LPC176X", "MBED_LPC1768", "NXP_EMAC"],
248-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
248+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
249249
"detect_code": ["1010"],
250250
"device_has": ["RTC", "USTICKER", "ANALOGIN", "ANALOGOUT", "CAN", "DEBUG_AWARENESS", "EMAC", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOCALFILESYSTEM", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SEMIHOST", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "FLASH"],
251251
"release_versions": ["2", "5"],
@@ -268,7 +268,7 @@
268268
"ARCH_PRO": {
269269
"supported_form_factors": ["ARDUINO"],
270270
"core": "Cortex-M3",
271-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
271+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
272272
"extra_labels": ["NXP", "LPC176X", "NXP_EMAC"],
273273
"macros": ["TARGET_LPC1768"],
274274
"inherits": ["LPCTarget"],
@@ -283,7 +283,7 @@
283283
"UBLOX_C027": {
284284
"supported_form_factors": ["ARDUINO"],
285285
"core": "Cortex-M3",
286-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
286+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
287287
"extra_labels": ["NXP", "LPC176X", "NXP_EMAC"],
288288
"config": {
289289
"modem_is_on_board": {
@@ -310,7 +310,7 @@
310310
"XBED_LPC1768": {
311311
"inherits": ["LPCTarget"],
312312
"core": "Cortex-M3",
313-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
313+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
314314
"extra_labels": ["NXP", "LPC176X", "XBED_LPC1768"],
315315
"macros": ["TARGET_LPC1768"],
316316
"detect_code": ["1010"],
@@ -348,7 +348,7 @@
348348
"default_toolchain": "uARM",
349349
"extra_labels": ["NXP", "LPC82X"],
350350
"is_disk_virtual": true,
351-
"supported_toolchains": ["uARM", "GCC_ARM", "GCC_CR", "IAR"],
351+
"supported_toolchains": ["uARM", "GCC_ARM", "IAR"],
352352
"inherits": ["LPCTarget"],
353353
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
354354
"default_lib": "small",
@@ -371,7 +371,7 @@
371371
"core": "Cortex-M4F",
372372
"extra_labels": ["NXP", "LPC408X", "NXP_EMAC"],
373373
"is_disk_virtual": true,
374-
"supported_toolchains": ["ARM", "GCC_CR", "GCC_ARM", "IAR"],
374+
"supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
375375
"post_binary_hook": {
376376
"function": "LPC4088Code.binary_hook"
377377
},
@@ -393,15 +393,15 @@
393393
"inherits": ["LPCTarget"],
394394
"core": "Cortex-M4F",
395395
"extra_labels": ["NXP", "LPC43XX", "LPC4330"],
396-
"supported_toolchains": ["ARM", "GCC_CR", "IAR", "GCC_ARM"],
396+
"supported_toolchains": ["ARM", "IAR", "GCC_ARM"],
397397
"device_has": ["ANALOGIN", "ANALOGOUT", "DEBUG_AWARENESS", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
398398
"device_name": "LPC4330"
399399
},
400400
"LPC4330_M0": {
401401
"inherits": ["LPCTarget"],
402402
"core": "Cortex-M0",
403403
"extra_labels": ["NXP", "LPC43XX", "LPC4330"],
404-
"supported_toolchains": ["ARM", "GCC_CR", "IAR"],
404+
"supported_toolchains": ["ARM", "IAR"],
405405
"device_has": ["ANALOGIN", "ANALOGOUT", "DEBUG_AWARENESS", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
406406
},
407407
"LPC4337": {
@@ -418,15 +418,15 @@
418418
"core": "Cortex-M3",
419419
"extra_labels": ["NXP", "LPC43XX"],
420420
"public": false,
421-
"supported_toolchains": ["ARM", "GCC_CR", "IAR"]
421+
"supported_toolchains": ["ARM", "IAR"]
422422
},
423423
"LPC11U37H_401": {
424424
"supported_form_factors": ["ARDUINO"],
425425
"core": "Cortex-M0",
426426
"default_toolchain": "uARM",
427427
"extra_labels": ["NXP", "LPC11UXX"],
428428
"macros": ["CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""],
429-
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "GCC_CR"],
429+
"supported_toolchains": ["ARM", "uARM", "GCC_ARM"],
430430
"inherits": ["LPCTarget"],
431431
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
432432
"default_lib": "small",

‎tools/build_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def prepare_toolchain(src_paths, build_dir, target, toolchain_name,
292292
Positional arguments:
293293
src_paths - the paths to source directories
294294
target - ['LPC1768', 'LPC11U24', etc.]
295-
toolchain_name - ['ARM', 'uARM', 'GCC_ARM', 'GCC_CR']
295+
toolchain_name - ['ARM', 'uARM', 'GCC_ARM', 'IAR']
296296
297297
Keyword arguments:
298298
macros - additional macros

‎tools/default_settings.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
# GCC ARM
3131
#GCC_ARM_PATH = ""
3232

33-
# GCC CodeRed
34-
#GCC_CR_PATH = "C:/code_red/RedSuite_4.2.0_349/redsuite/Tools/bin"
35-
3633
# IAR
3734
#IAR_PATH = "C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.0/arm"
3835

‎tools/export/nb/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,6 @@ def create_jinja_ctx(self):
177177

178178
sys_libs = [self.prepare_sys_lib(lib) for lib
179179
in self.toolchain.sys_libs]
180-
preproc = " ".join([basename(self.toolchain.preproc[0])] +
181-
self.toolchain.preproc[1:] +
182-
self.toolchain.ld[1:])
183180

184181
if 'nbproject' in include_paths:
185182
include_paths.remove('nbproject')
@@ -208,7 +205,7 @@ def create_jinja_ctx(self):
208205
'cpp_std': self.get_netbeans_cpp_std(cpp_std),
209206
'linker_script': self.ld_script,
210207
'linker_libs': sys_libs,
211-
'pp_cmd': preproc,
208+
'pp_cmd': " ".join(self.toolchain.preproc),
212209
'cc_cmd': self.toolchain.cc[0],
213210
'cppc_cmd': self.toolchain.cppc[0],
214211
'asm_cmd': self.toolchain.asm[0],

‎tools/memap.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ def generate_table(self, file_desc):
764764

765765
return output
766766

767-
toolchains = ["ARM", "ARM_STD", "ARM_MICRO", "GCC_ARM", "GCC_CR", "IAR"]
767+
toolchains = ["ARM", "ARM_STD", "ARM_MICRO", "GCC_ARM", "IAR"]
768768

769769
def compute_report(self):
770770
""" Generates summary of memory usage for main areas
@@ -814,7 +814,7 @@ def parse(self, mapfile, toolchain):
814814
self.tc_name = toolchain.title()
815815
if toolchain in ("ARM", "ARM_STD", "ARM_MICRO", "ARMC6"):
816816
parser = _ArmccParser
817-
elif toolchain == "GCC_ARM" or toolchain == "GCC_CR":
817+
elif toolchain == "GCC_ARM":
818818
parser = _GccParser
819819
elif toolchain == "IAR":
820820
parser = _IarParser

‎tools/settings.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
# GCC ARM
3737
GCC_ARM_PATH = ""
3838

39-
# GCC CodeRed
40-
GCC_CR_PATH = ""
41-
4239
# IAR
4340
IAR_PATH = ""
4441

@@ -83,8 +80,7 @@
8380
##############################################################################
8481
# User Settings (env vars)
8582
##############################################################################
86-
_ENV_PATHS = ['ARM_PATH', 'GCC_ARM_PATH', 'GCC_CR_PATH', 'IAR_PATH',
87-
'ARMC6_PATH']
83+
_ENV_PATHS = ['ARM_PATH', 'GCC_ARM_PATH', 'IAR_PATH', 'ARMC6_PATH']
8884

8985
for _n in _ENV_PATHS:
9086
if getenv('MBED_'+_n):

‎tools/singletest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{
2525
"targets": {
2626
"KL46Z": ["ARM", "GCC_ARM"],
27-
"LPC1768": ["ARM", "GCC_ARM", "GCC_CR", "IAR"],
27+
"LPC1768": ["ARM", "GCC_ARM", "IAR"],
2828
"LPC11U24": ["uARM"],
2929
"NRF51822": ["ARM"]
3030
}

‎tools/size.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def benchmarks():
6363
csv_data.writerow(['Toolchain', "Target", "Benchmark", "code", "data", "bss", "flash"])
6464

6565
# Build
66-
for toolchain in ['ARM', 'uARM', 'GCC_CR', 'GCC_ARM']:
66+
for toolchain in ['ARM', 'uARM', 'GCC_ARM']:
6767
for mcu in ["LPC1768", "LPC11U24"]:
6868
# Build Libraries
6969
build_mbed_libs(mcu, toolchain)
@@ -118,4 +118,4 @@ def compare(t1, t2, target):
118118

119119

120120
if __name__ == '__main__':
121-
compare("GCC_CR", "LPC1768")
121+
compare("ARM", "GCC_ARM", "LPC1768")

0 commit comments

Comments
 (0)