Skip to content

Allow 'small-build' and 'big-build' to be used as options. #2409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 25, 2016
Merged

Allow 'small-build' and 'big-build' to be used as options. #2409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cce10e2
Allow 'small-build' and 'big-build' to be used as options.
pan- Aug 10, 2016
afde624
Rename big-build option into standard-build.
pan- Aug 12, 2016
73a9258
Improve naming of the command line option which select the c library …
pan- Aug 17, 2016
fe322ad
Make selection of c library used consistent.
pan- Aug 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions hal/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"features": [],
"detect_code": [],
"public": false,
"default_build": "standard"
"default_lib": "std"
},
"CM4_UARM": {
"inherits": ["Target"],
"core": "Cortex-M4",
"default_toolchain": "uARM",
"public": false,
"supported_toolchains": ["uARM"],
"default_build": "small"
"default_lib": "small"
},
"CM4_ARM": {
"inherits": ["Target"],
Expand All @@ -32,7 +32,7 @@
"default_toolchain": "uARM",
"public": false,
"supported_toolchains": ["uARM"],
"default_build": "small"
"default_lib": "small"
},
"CM4F_ARM": {
"inherits": ["Target"],
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -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"],
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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"],
Expand All @@ -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": {
Expand All @@ -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"],
Expand All @@ -184,7 +184,7 @@
"progen": {
"target": "lpc11u37_501"
},
"default_build": "small"
"default_lib": "small"
},
"LPCCAPPUCCINO": {
"inherits": ["LPC11U37_501"],
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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"],
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -436,7 +436,7 @@
"progen": {
"target": "cocorico"
},
"default_build": "small"
"default_lib": "small"
},
"KL05Z": {
"supported_form_factors": ["ARDUINO"],
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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"]
},

Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -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"],
Expand All @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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"]
},
Expand All @@ -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"]
},
Expand Down Expand Up @@ -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"],
Expand Down
6 changes: 3 additions & 3 deletions tools/build_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion tools/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ def get_default_options_parser(add_clean=True, add_options=True):
'run Goanna static code analyzer")'),
type=argparse_lowercase_hyphen_type(['save-asm',
'debug-info',
'analyze'],
'analyze',
'small-lib',
'std-lib'],
"build option"))

return parser
2 changes: 1 addition & 1 deletion tools/test/config_test/test12/mbed_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
"default_lib": "std"
}
},
"target_overrides": {
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config_test/test16/mbed_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
"default_lib": "std"
}
},
"macros": ["APP1=10", "APP2", "LIB2_1=5"]
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config_test/test21/mbed_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
"default_lib": "std"
}
},
"target_overrides": {
Expand Down
Loading