mirror of https://github.com/ARMmbed/mbed-os.git
Fix RTOS build options
parent
8724eb616b
commit
b5c8a23e79
|
@ -37,6 +37,13 @@ from workspace_tools.build_api import static_analysis_scan, static_analysis_scan
|
|||
from workspace_tools.build_api import print_build_results
|
||||
from workspace_tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT
|
||||
|
||||
# Cortex-M and Cortex-A use different RTOS sources, return the proper libs here
|
||||
def get_rtos_libs(options, mcu):
|
||||
if options.rtos:
|
||||
libs = ['rtx', 'rtos'] if mcu.core != 'Cortex-A9' else ['rtx_ca', 'rtos_ca']
|
||||
else:
|
||||
libs = []
|
||||
return libs
|
||||
|
||||
if __name__ == '__main__':
|
||||
start = time()
|
||||
|
@ -156,11 +163,6 @@ if __name__ == '__main__':
|
|||
libraries = []
|
||||
|
||||
# Additional Libraries
|
||||
if options.rtos:
|
||||
if mcu == "RZ_A1H":
|
||||
libraries.extend(["rtx_ca", "rtos_ca"])
|
||||
else:
|
||||
libraries.extend(["rtx", "rtos"])
|
||||
if options.eth:
|
||||
libraries.append("eth")
|
||||
if options.usb:
|
||||
|
@ -189,7 +191,7 @@ if __name__ == '__main__':
|
|||
mcu = TARGET_MAP[target]
|
||||
# CMSIS and MBED libs analysis
|
||||
static_analysis_scan(mcu, toolchain, CPPCHECK_CMD, CPPCHECK_MSG_FORMAT, verbose=options.verbose, jobs=options.jobs)
|
||||
for lib_id in libraries:
|
||||
for lib_id in libraries + get_rtos_libs(options, mcu):
|
||||
# Static check for library
|
||||
static_analysis_scan_lib(lib_id, mcu, toolchain, CPPCHECK_CMD, CPPCHECK_MSG_FORMAT,
|
||||
options=options.options,
|
||||
|
@ -212,8 +214,7 @@ if __name__ == '__main__':
|
|||
lib_build_res = build_mbed_libs(mcu, toolchain, options=options.options,
|
||||
notify=notify, verbose=options.verbose, jobs=options.jobs, clean=options.clean,
|
||||
macros=options.macros)
|
||||
|
||||
for lib_id in libraries:
|
||||
for lib_id in libraries + get_rtos_libs(options, mcu):
|
||||
notify = print_notify_verbose if options.extra_verbose_notify else None # Special notify for CI (more verbose)
|
||||
build_lib(lib_id, mcu, toolchain, options=options.options,
|
||||
notify=notify, verbose=options.verbose, clean=options.clean,
|
||||
|
|
Loading…
Reference in New Issue