Skip to content

Commit fe322ad

Browse files
pan-pan-
committed
Make selection of c library used consistent.
* rename "default_build" property into "default_lib" * rename "standard" value for "default_build" into "std".
1 parent 73a9258 commit fe322ad

File tree

12 files changed

+52
-55
lines changed

12 files changed

+52
-55
lines changed

‎hal/targets.json

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"features": [],
1111
"detect_code": [],
1212
"public": false,
13-
"default_build": "standard"
13+
"default_lib": "std"
1414
},
1515
"CM4_UARM": {
1616
"inherits": ["Target"],
1717
"core": "Cortex-M4",
1818
"default_toolchain": "uARM",
1919
"public": false,
2020
"supported_toolchains": ["uARM"],
21-
"default_build": "small"
21+
"default_lib": "small"
2222
},
2323
"CM4_ARM": {
2424
"inherits": ["Target"],
@@ -32,7 +32,7 @@
3232
"default_toolchain": "uARM",
3333
"public": false,
3434
"supported_toolchains": ["uARM"],
35-
"default_build": "small"
35+
"default_lib": "small"
3636
},
3737
"CM4F_ARM": {
3838
"inherits": ["Target"],
@@ -63,7 +63,7 @@
6363
"target": "lpc1114_102"
6464
},
6565
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
66-
"default_build": "small",
66+
"default_lib": "small",
6767
"release_versions": ["2"]
6868
},
6969
"LPC11U24": {
@@ -77,7 +77,7 @@
7777
},
7878
"detect_code": ["1040"],
7979
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOCALFILESYSTEM", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SEMIHOST", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
80-
"default_build": "small",
80+
"default_lib": "small",
8181
"release_versions": ["2"]
8282
},
8383
"OC_MBUINO": {
@@ -104,7 +104,7 @@
104104
"extra_labels": ["NXP", "LPC11UXX"],
105105
"supported_toolchains": ["ARM", "uARM", "GCC_ARM"],
106106
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
107-
"default_build": "small"
107+
"default_lib": "small"
108108
},
109109
"MICRONFCBOARD": {
110110
"inherits": ["LPC11U34_421"],
@@ -122,7 +122,7 @@
122122
"target": "lpc11u35_401"
123123
},
124124
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
125-
"default_build": "small",
125+
"default_lib": "small",
126126
"release_versions": ["2"]
127127
},
128128
"LPC11U35_501": {
@@ -135,7 +135,7 @@
135135
"target": "lpc11u35_501"
136136
},
137137
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
138-
"default_build": "small",
138+
"default_lib": "small",
139139
"release_versions": ["2"]
140140
},
141141
"LPC11U35_501_IBDAP": {
@@ -148,7 +148,7 @@
148148
"target": "lpc11u35_501"
149149
},
150150
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
151-
"default_build": "small"
151+
"default_lib": "small"
152152
},
153153
"XADOW_M0": {
154154
"inherits": ["LPCTarget"],
@@ -160,7 +160,7 @@
160160
"target": "lpc11u35_501"
161161
},
162162
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
163-
"default_build": "small",
163+
"default_lib": "small",
164164
"release_versions": ["2"]
165165
},
166166
"LPC11U35_Y5_MBUG": {
@@ -173,7 +173,7 @@
173173
"target": "lpc11u35_501"
174174
},
175175
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
176-
"default_build": "small"
176+
"default_lib": "small"
177177
},
178178
"LPC11U37_501": {
179179
"inherits": ["LPCTarget"],
@@ -184,7 +184,7 @@
184184
"progen": {
185185
"target": "lpc11u37_501"
186186
},
187-
"default_build": "small"
187+
"default_lib": "small"
188188
},
189189
"LPCCAPPUCCINO": {
190190
"inherits": ["LPC11U37_501"],
@@ -204,7 +204,7 @@
204204
"target": "lpc11u37_501"
205205
},
206206
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
207-
"default_build": "small",
207+
"default_lib": "small",
208208
"release_versions": ["2"]
209209
},
210210
"LPC11U68": {
@@ -219,7 +219,7 @@
219219
},
220220
"detect_code": ["1168"],
221221
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI"],
222-
"default_build": "small",
222+
"default_lib": "small",
223223
"release_versions": ["2"]
224224
},
225225
"LPC1347": {
@@ -243,7 +243,7 @@
243243
},
244244
"detect_code": ["1549"],
245245
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "INTERRUPTIN", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE"],
246-
"default_build": "small",
246+
"default_lib": "small",
247247
"release_versions": ["2"]
248248
},
249249
"LPC1768": {
@@ -315,7 +315,7 @@
315315
"target": "lpc810"
316316
},
317317
"device_has": ["ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE"],
318-
"default_build": "small"
318+
"default_lib": "small"
319319
},
320320
"LPC812": {
321321
"supported_form_factors": ["ARDUINO"],
@@ -330,7 +330,7 @@
330330
},
331331
"detect_code": ["1050"],
332332
"device_has": ["ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE"],
333-
"default_build": "small",
333+
"default_lib": "small",
334334
"release_versions": ["2"]
335335
},
336336
"LPC824": {
@@ -345,7 +345,7 @@
345345
"target": "lpc824m201"
346346
},
347347
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
348-
"default_build": "small",
348+
"default_lib": "small",
349349
"release_versions": ["2"]
350350
},
351351
"SSCI824": {
@@ -359,7 +359,7 @@
359359
"target": "ssci824"
360360
},
361361
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
362-
"default_build": "small",
362+
"default_lib": "small",
363363
"release_versions": ["2"]
364364
},
365365
"LPC4088": {
@@ -422,7 +422,7 @@
422422
"target": "lpc11u37_401"
423423
},
424424
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
425-
"default_build": "small",
425+
"default_lib": "small",
426426
"release_versions": ["2"]
427427
},
428428
"ELEKTOR_COCORICO": {
@@ -436,7 +436,7 @@
436436
"progen": {
437437
"target": "cocorico"
438438
},
439-
"default_build": "small"
439+
"default_lib": "small"
440440
},
441441
"KL05Z": {
442442
"supported_form_factors": ["ARDUINO"],
@@ -450,7 +450,7 @@
450450
"target": "frdm-kl05z"
451451
},
452452
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SEMIHOST", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
453-
"default_build": "small",
453+
"default_lib": "small",
454454
"release_versions": ["2"]
455455
},
456456
"KL25Z": {
@@ -539,7 +539,7 @@
539539
"detect_code": ["0261"],
540540
"progen_target": {"target": "frdm-kl27z"},
541541
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
542-
"default_build": "standard",
542+
"default_lib": "std",
543543
"release_versions": ["2"]
544544
},
545545
"KL43Z": {
@@ -590,7 +590,7 @@
590590
"detect_code": ["0214"],
591591
"progen": {"target": "hexiwear-k64f"},
592592
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
593-
"default_build": "standard",
593+
"default_lib": "std",
594594
"release_versions": ["2", "5"]
595595
},
596596
"K66F": {
@@ -628,7 +628,7 @@
628628
"progen": {"target": "nucleo-f031k6"},
629629
"detect_code": ["0791"],
630630
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
631-
"default_build": "small",
631+
"default_lib": "small",
632632
"release_versions": ["2"]
633633
},
634634
"NUCLEO_F042K6": {
@@ -641,7 +641,7 @@
641641
"progen": {"target": "nucleo-f042k6"},
642642
"detect_code": ["0785"],
643643
"device_has": ["ANALOGIN", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
644-
"default_build": "small",
644+
"default_lib": "small",
645645
"release_versions": ["2"]
646646
},
647647
"NUCLEO_F070RB": {
@@ -798,7 +798,7 @@
798798
"inherits": ["Target"],
799799
"detect_code": ["----"],
800800
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
801-
"default_build": "small",
801+
"default_lib": "small",
802802
"release_versions": ["2"]
803803
},
804804
"NUCLEO_F429ZI": {
@@ -890,7 +890,7 @@
890890
"detect_code": ["0780"],
891891
"progen": {"target":"nucleo-l011k4"},
892892
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
893-
"default_build": "small",
893+
"default_lib": "small",
894894
"release_versions": ["2"]
895895
},
896896

@@ -904,7 +904,7 @@
904904
"detect_code": ["0790"],
905905
"progen": {"target": "nucleo-l031k6"},
906906
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
907-
"default_build": "small",
907+
"default_lib": "small",
908908
"release_versions": ["2"]
909909
},
910910
"NUCLEO_L053R8": {
@@ -1138,7 +1138,7 @@
11381138
"progen": {"target": "stm32l151rc"},
11391139
"detect_code": ["4100"],
11401140
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1141-
"default_build": "small",
1141+
"default_lib": "small",
11421142
"release_versions": ["2"]
11431143
},
11441144
"DISCO_F401VC": {
@@ -1158,7 +1158,7 @@
11581158
"macros": ["HSE_VALUE=24000000", "HSE_STARTUP_TIMEOUT=5000"],
11591159
"inherits": ["Target"],
11601160
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1161-
"default_build": "small"
1161+
"default_lib": "small"
11621162
},
11631163
"NZ32_SC151": {
11641164
"inherits": ["Target"],
@@ -1169,7 +1169,7 @@
11691169
"supported_toolchains": ["ARM", "uARM", "GCC_ARM"],
11701170
"progen": {"target": "stm32l151rc"},
11711171
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1172-
"default_build": "small"
1172+
"default_lib": "small"
11731173
},
11741174
"MCU_NRF51": {
11751175
"inherits": ["Target"],
@@ -1223,7 +1223,7 @@
12231223
"extra_labels_add": ["MCU_NORDIC_16K", "MCU_NRF51_16K"],
12241224
"macros_add": ["TARGET_MCU_NORDIC_16K", "TARGET_MCU_NRF51_16K"],
12251225
"public": false,
1226-
"default_build": "small"
1226+
"default_lib": "small"
12271227
},
12281228
"MCU_NRF51_16K_BOOT_BASE": {
12291229
"inherits": ["MCU_NRF51_16K_BASE"],
@@ -1676,7 +1676,7 @@
16761676
"program_cycle_s": 2,
16771677
"device_has": ["ANALOGIN", "CAN", "ERROR_PATTERN", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
16781678
"features": ["IPV4"],
1679-
"default_build": "standard",
1679+
"default_lib": "std",
16801680
"release_versions": ["2", "5"]
16811681
},
16821682
"MAXWSNENV": {
@@ -1743,7 +1743,7 @@
17431743
"target": "efm32zg-stk"
17441744
},
17451745
"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"],
1746-
"default_build": "small",
1746+
"default_lib": "small",
17471747
"forced_reset_timeout": 2,
17481748
"release_versions": ["2"]
17491749
},
@@ -1758,7 +1758,7 @@
17581758
"target": "efm32hg-stk"
17591759
},
17601760
"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"],
1761-
"default_build": "small",
1761+
"default_lib": "small",
17621762
"forced_reset_timeout": 2,
17631763
"release_versions": ["2"]
17641764
},
@@ -1852,7 +1852,7 @@
18521852
"progen": {"target": "samg55j19"},
18531853
"progen_target": "samg55j19",
18541854
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH"],
1855-
"default_build": "standard"
1855+
"default_lib": "std"
18561856
},
18571857
"MCU_NRF51_UNIFIED": {
18581858
"inherits": ["Target"],

‎tools/build_api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,12 @@ def is_official_target(target_name, version):
199199
("following toolchains: %s" %
200200
", ".join(supported_toolchains_sorted))
201201

202-
elif not target.default_build == 'standard':
202+
elif not target.default_lib == 'std':
203203
result = False
204204
reason = ("Target '%s' must set the " % target.name) + \
205-
("'default_build' to 'standard' to be included in the ") + \
205+
("'default_lib' to 'std' to be included in the ") + \
206206
("mbed OS 5.0 official release." + linesep) + \
207-
("Currently it is set to '%s'" % target.default_build)
207+
("Currently it is set to '%s'" % target.default_lib)
208208

209209
else:
210210
result = False

‎tools/options.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ def get_default_options_parser(add_clean=True, add_options=True):
7676
type=argparse_lowercase_hyphen_type(['save-asm',
7777
'debug-info',
7878
'analyze',
79-
'small-lib',
80-
'std-lib'],
79+
'small-lib',
80+
'std-lib'],
8181
"build option"))
8282

8383
return parser

‎tools/test/config_test/test12/mbed_app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_build": "standard"
7+
"default_lib": "std"
88
}
99
},
1010
"target_overrides": {

‎tools/test/config_test/test16/mbed_app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_build": "standard"
7+
"default_lib": "std"
88
}
99
},
1010
"macros": ["APP1=10", "APP2", "LIB2_1=5"]

‎tools/test/config_test/test21/mbed_app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_build": "standard"
7+
"default_lib": "std"
88
}
99
},
1010
"target_overrides": {

0 commit comments

Comments
 (0)