ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make selection of c library used consistent. 

* rename "default_build" property into "default_lib"
* rename "standard" value for "default_build" into "std".
pull/2409/head
Vincent Coubard 2016-08-17 13:16:07 +01:00
parent 73a925810c
commit fe322adc9c
12 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
hal/targets.json
View File

@ -10,7 +10,7 @@
"features": [],
"detect_code": [],
"public": false,
"default_build": "standard"
"default_lib": "std"
},
"CM4_UARM": {
"inherits": ["Target"],
@ -18,7 +18,7 @@
"default_toolchain": "uARM",
"public": false,
"supported_toolchains": ["uARM"],
"default_build": "small"
"default_lib": "small"
},
"CM4_ARM": {
"inherits": ["Target"],
@ -32,7 +32,7 @@
"default_toolchain": "uARM",
"public": false,
"supported_toolchains": ["uARM"],
"default_build": "small"
"default_lib": "small"
},
"CM4F_ARM": {
"inherits": ["Target"],
@ -63,7 +63,7 @@
"target": "lpc1114_102"
},
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"LPC11U24": {
@ -77,7 +77,7 @@
},
"detect_code": ["1040"],
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOCALFILESYSTEM", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SEMIHOST", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"OC_MBUINO": {
@ -104,7 +104,7 @@
"extra_labels": ["NXP", "LPC11UXX"],
"supported_toolchains": ["ARM", "uARM", "GCC_ARM"],
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small"
"default_lib": "small"
},
"MICRONFCBOARD": {
"inherits": ["LPC11U34_421"],
@ -122,7 +122,7 @@
"target": "lpc11u35_401"
},
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"LPC11U35_501": {
@ -135,7 +135,7 @@
"target": "lpc11u35_501"
},
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"LPC11U35_501_IBDAP": {
@ -148,7 +148,7 @@
"target": "lpc11u35_501"
},
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small"
"default_lib": "small"
},
"XADOW_M0": {
"inherits": ["LPCTarget"],
@ -160,7 +160,7 @@
"target": "lpc11u35_501"
},
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"LPC11U35_Y5_MBUG": {
@ -173,7 +173,7 @@
"target": "lpc11u35_501"
},
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small"
"default_lib": "small"
},
"LPC11U37_501": {
"inherits": ["LPCTarget"],
@ -184,7 +184,7 @@
"progen": {
"target": "lpc11u37_501"
},
"default_build": "small"
"default_lib": "small"
},
"LPCCAPPUCCINO": {
"inherits": ["LPC11U37_501"],
@ -204,7 +204,7 @@
"target": "lpc11u37_501"
},
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"LPC11U68": {
@ -219,7 +219,7 @@
},
"detect_code": ["1168"],
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"LPC1347": {
@ -243,7 +243,7 @@
},
"detect_code": ["1549"],
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "INTERRUPTIN", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"LPC1768": {
@ -315,7 +315,7 @@
"target": "lpc810"
},
"device_has": ["ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small"
"default_lib": "small"
},
"LPC812": {
"supported_form_factors": ["ARDUINO"],
@ -330,7 +330,7 @@
},
"detect_code": ["1050"],
"device_has": ["ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"LPC824": {
@ -345,7 +345,7 @@
"target": "lpc824m201"
},
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"SSCI824": {
@ -359,7 +359,7 @@
"target": "ssci824"
},
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"LPC4088": {
@ -422,7 +422,7 @@
"target": "lpc11u37_401"
},
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"ELEKTOR_COCORICO": {
@ -436,7 +436,7 @@
"progen": {
"target": "cocorico"
},
"default_build": "small"
"default_lib": "small"
},
"KL05Z": {
"supported_form_factors": ["ARDUINO"],
@ -450,7 +450,7 @@
"target": "frdm-kl05z"
},
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SEMIHOST", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"KL25Z": {
@ -539,7 +539,7 @@
"detect_code": ["0261"],
"progen_target": {"target": "frdm-kl27z"},
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "standard",
"default_lib": "std",
"release_versions": ["2"]
},
"KL43Z": {
@ -590,7 +590,7 @@
"detect_code": ["0214"],
"progen": {"target": "hexiwear-k64f"},
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "standard",
"default_lib": "std",
"release_versions": ["2", "5"]
},
"K66F": {
@ -628,7 +628,7 @@
"progen": {"target": "nucleo-f031k6"},
"detect_code": ["0791"],
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"NUCLEO_F042K6": {
@ -641,7 +641,7 @@
"progen": {"target": "nucleo-f042k6"},
"detect_code": ["0785"],
"device_has": ["ANALOGIN", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"NUCLEO_F070RB": {
@ -798,7 +798,7 @@
"inherits": ["Target"],
"detect_code": ["----"],
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"NUCLEO_F429ZI": {
@ -890,7 +890,7 @@
"detect_code": ["0780"],
"progen": {"target":"nucleo-l011k4"},
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
@ -904,7 +904,7 @@
"detect_code": ["0790"],
"progen": {"target": "nucleo-l031k6"},
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"NUCLEO_L053R8": {
@ -1138,7 +1138,7 @@
"progen": {"target": "stm32l151rc"},
"detect_code": ["4100"],
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small",
"default_lib": "small",
"release_versions": ["2"]
},
"DISCO_F401VC": {
@ -1158,7 +1158,7 @@
"macros": ["HSE_VALUE=24000000", "HSE_STARTUP_TIMEOUT=5000"],
"inherits": ["Target"],
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small"
"default_lib": "small"
},
"NZ32_SC151": {
"inherits": ["Target"],
@ -1169,7 +1169,7 @@
"supported_toolchains": ["ARM", "uARM", "GCC_ARM"],
"progen": {"target": "stm32l151rc"},
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"default_build": "small"
"default_lib": "small"
},
"MCU_NRF51": {
"inherits": ["Target"],
@ -1223,7 +1223,7 @@
"extra_labels_add": ["MCU_NORDIC_16K", "MCU_NRF51_16K"],
"macros_add": ["TARGET_MCU_NORDIC_16K", "TARGET_MCU_NRF51_16K"],
"public": false,
"default_build": "small"
"default_lib": "small"
},
"MCU_NRF51_16K_BOOT_BASE": {
"inherits": ["MCU_NRF51_16K_BASE"],
@ -1676,7 +1676,7 @@
"program_cycle_s": 2,
"device_has": ["ANALOGIN", "CAN", "ERROR_PATTERN", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"features": ["IPV4"],
"default_build": "standard",
"default_lib": "std",
"release_versions": ["2", "5"]
},
"MAXWSNENV": {
@ -1743,7 +1743,7 @@
"target": "efm32zg-stk"
},
"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"],
"default_build": "small",
"default_lib": "small",
"forced_reset_timeout": 2,
"release_versions": ["2"]
},
@ -1758,7 +1758,7 @@
"target": "efm32hg-stk"
},
"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"],
"default_build": "small",
"default_lib": "small",
"forced_reset_timeout": 2,
"release_versions": ["2"]
},
@ -1852,7 +1852,7 @@
"progen": {"target": "samg55j19"},
"progen_target": "samg55j19",
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH"],
"default_build": "standard"
"default_lib": "std"
},
"MCU_NRF51_UNIFIED": {
"inherits": ["Target"],

6
tools/build_api.py
View File

@ -199,12 +199,12 @@ def is_official_target(target_name, version):
("following toolchains: %s" %
", ".join(supported_toolchains_sorted))
elif not target.default_build == 'standard':
elif not target.default_lib == 'std':
result = False
reason = ("Target '%s' must set the " % target.name) + \
("'default_build' to 'standard' to be included in the ") + \
("'default_lib' to 'std' to be included in the ") + \
("mbed OS 5.0 official release." + linesep) + \
("Currently it is set to '%s'" % target.default_build)
("Currently it is set to '%s'" % target.default_lib)
else:
result = False

4
tools/options.py
View File

@ -76,8 +76,8 @@ def get_default_options_parser(add_clean=True, add_options=True):
type=argparse_lowercase_hyphen_type(['save-asm',
'debug-info',
'analyze',
'small-lib',
'std-lib'],
'small-lib',
'std-lib'],
"build option"))
return parser

2
tools/test/config_test/test12/mbed_app.json
View File

@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
"default_lib": "std"
}
},
"target_overrides": {

2
tools/test/config_test/test16/mbed_app.json
View File

@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
"default_lib": "std"
}
},
"macros": ["APP1=10", "APP2", "LIB2_1=5"]

2
tools/test/config_test/test21/mbed_app.json
View File

@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
"default_lib": "std"
}
},
"target_overrides": {

3
tools/test/config_test/test22/mbed_app.json
View File

@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
"default_lib": "std"
}
},
"target_overrides": {
@ -13,4 +13,3 @@
}
}
}

2
tools/test/config_test/test24/mbed_app.json
View File

@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
"default_lib": "std"
}
},
"target_overrides": {

2
tools/test/config_test/test26/mbed_app.json
View File

@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
"default_lib": "std"
}
},
"target_overrides": {

3
tools/test/config_test/test27/mbed_app.json
View File

@ -4,8 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": ["IPV4"],
"default_build": "standard"
"default_lib": "std"
}
}
}

3
tools/test/config_test/test28/mbed_app.json
View File

@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
"default_lib": "std"
}
},
"target_overrides": {
@ -14,4 +14,3 @@
}
}
}

4
tools/toolchains/gcc.py
View File

@ -277,9 +277,9 @@ class GCC_ARM(GCC):
use_nano = False
elif "small-lib" in self.options:
use_nano = True
elif target.default_build == "standard":
elif target.default_lib == "std":
use_nano = False
elif target.default_build == "small":
elif target.default_lib == "small":
use_nano = True
else:
use_nano = False