diff --git a/tools/build_travis.py b/tools/build_travis.py index ba72bc64cb7..01663577e13 100644 --- a/tools/build_travis.py +++ b/tools/build_travis.py @@ -24,95 +24,95 @@ ################################################################################ # Configure builds here -# "libs" can contain "dsp", "rtos", "usb_host", "usb" +# "libs" can contain "dsp", "usb_host", "usb" build_list = ( - { "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "LPC11U24", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "LPC11U24", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "OC_MBUINO", "toolchains": "GCC_ARM", "libs": [] }, { "target": "LPC11U24_301", "toolchains": "GCC_ARM", "libs": [] }, { "target": "B96B_F446VE", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "NUCLEO_L053R8", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "NUCLEO_L152RE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "NUCLEO_L152RE", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "NUCLEO_F030R8", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "NUCLEO_F031K6", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "NUCLEO_F042K6", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "NUCLEO_F070RB", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "NUCLEO_F072RB", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "NUCLEO_F091RC", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "NUCLEO_F103RB", "toolchains": "GCC_ARM", "libs": ["rtos"] }, - { "target": "NUCLEO_F207ZG", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "NUCLEO_F302R8", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "NUCLEO_F303K8", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "NUCLEO_F303RE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "NUCLEO_F303ZE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "NUCLEO_F334R8", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "NUCLEO_F401RE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "NUCLEO_F410RB", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "NUCLEO_F411RE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "NUCLEO_F412ZG", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "NUCLEO_F072RB", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "NUCLEO_F091RC", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "NUCLEO_F103RB", "toolchains": "GCC_ARM" }, + { "target": "NUCLEO_F207ZG", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "NUCLEO_F302R8", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "NUCLEO_F303K8", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "NUCLEO_F303RE", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "NUCLEO_F303ZE", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "NUCLEO_F334R8", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "NUCLEO_F401RE", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "NUCLEO_F410RB", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "NUCLEO_F411RE", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "NUCLEO_F412ZG", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "NUCLEO_L432KC", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "NUCLEO_L476RG", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "NUCLEO_L476RG", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "NUCLEO_L011K4", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "NUCLEO_L031K6", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "NUCLEO_L073RZ", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "NUCLEO_F429ZI", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "NUCLEO_F446RE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "NUCLEO_F446ZE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "NUCLEO_F746ZG", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "NUCLEO_F767ZI", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, + { "target": "NUCLEO_F429ZI", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "NUCLEO_F446RE", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "NUCLEO_F446ZE", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "NUCLEO_F746ZG", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "NUCLEO_F767ZI", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, - { "target": "MOTE_L152RC", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "MOTE_L152RC", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "ELMO_F411RE", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "MTS_MDOT_F405RG", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "MTS_MDOT_F411RE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "MTS_MDOT_F405RG", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "MTS_MDOT_F411RE", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "MTS_DRAGONFLY_F411RE", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "ARCH_MAX", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "ARCH_MAX", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "DISCO_F051R8", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "DISCO_F303VC", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "DISCO_F334C8", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "DISCO_F303VC", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "DISCO_F334C8", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "DISCO_F401VC", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "DISCO_F407VG", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "DISCO_F429ZI", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "DISCO_F469NI", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "DISCO_F407VG", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "DISCO_F429ZI", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "DISCO_F469NI", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "DISCO_F746NG", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "DISCO_F769NI", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "DISCO_F769NI", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "LPC1114", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "LPC11U35_401", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "UBLOX_C027", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "LPC1114", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "LPC11U35_401", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "UBLOX_C027", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "LPC11U35_501", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "LPC11U68", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "LPC11U68", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "LPC11U37H_401", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "KL05Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "KL25Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "KL27Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "KL43Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "KL46Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, + { "target": "KL05Z", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "KL25Z", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "KL27Z", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "KL43Z", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "KL46Z", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, { "target": "K20D50M", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "TEENSY3_1", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "K64F", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "K22F", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "LPC4088", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "ARCH_PRO", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "LPC1549", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "NRF51822", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "K64F", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "K22F", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "LPC4088", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "ARCH_PRO", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "LPC1549", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "NRF51822", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "DELTA_DFCM_NNN40", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "NRF51_DK", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "NRF51_MICROBIT", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "NRF51_DK", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "NRF51_MICROBIT", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "EFM32ZG_STK3200", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "EFM32HG_STK3400", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "EFM32LG_STK3600", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "EFM32GG_STK3700", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "EFM32WG_STK3800", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "EFM32PG_STK3401", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, + { "target": "EFM32HG_STK3400", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "EFM32LG_STK3600", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "EFM32GG_STK3700", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "EFM32WG_STK3800", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "EFM32PG_STK3401", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "MAXWSNENV", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "MAX32600MBED", "toolchains": "GCC_ARM", "libs": ["dsp"] }, @@ -124,156 +124,136 @@ { "target": "SAMD21J18A", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "SAMD21G18A", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "SAML21J18A", "toolchains": "GCC_ARM", "libs": ["dsp"] }, - { "target": "DISCO_L476VG", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "DISCO_L072CZ_LRWAN1", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, - { "target": "NUMAKER_PFM_NUC472", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, - { "target": "NUMAKER_PFM_M453", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, + + { "target": "DISCO_L476VG", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "DISCO_L072CZ_LRWAN1", "toolchains": "GCC_ARM", "libs": ["dsp"] }, + { "target": "NUMAKER_PFM_NUC472", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, + { "target": "NUMAKER_PFM_M453", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] }, ) ################################################################################ -# Configure example test building (linking against external mbed SDK libraries like rtos) +# Configure example test building (linking against external mbed SDK libraries) linking_list = [ {"target": "LPC1768", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_15", "MBED_16", "MBED_17"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "K64F", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "K22F", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "KL43Z", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "NUCLEO_F446RE", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "NUCLEO_F446ZE", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "NUCLEO_F401RE", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], - "usb" : ["USB_1", "USB_2" ,"USB_3"], - } - }, + "usb" : ["USB_1", "USB_2" ,"USB_3"], + } + }, {"target": "NUCLEO_F411RE", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "NUCLEO_F412ZG", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], - } - }, + } + }, {"target": "NUCLEO_F429ZI", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "NUCLEO_F207ZG", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "NUCLEO_F746ZG", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "NUCLEO_F767ZI", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "NUCLEO_L476RG", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], - } - }, + } + }, {"target": "DISCO_F429ZI", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], - } - }, + } + }, {"target": "DISCO_F407VG", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "NUCLEO_F303ZE", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "DISCO_L476VG", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "DISCO_L072CZ_LRWAN1", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], - } + } }, {"target": "NUMAKER_PFM_NUC472", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } }, {"target": "NUMAKER_PFM_M453", "toolchains": "GCC_ARM", "tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"], - "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"], "usb" : ["USB_1", "USB_2" ,"USB_3"], } } diff --git a/tools/libraries.py b/tools/libraries.py index 997b9de3bad..bf1e2997f1d 100644 --- a/tools/libraries.py +++ b/tools/libraries.py @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. """ -from tools.paths import MBED_RTX, RTOS, RTOS_LIBRARIES, MBED_LIBRARIES,\ +from tools.paths import MBED_LIBRARIES,\ MBED_RPC, RPC_LIBRARY, USB, USB_LIBRARIES, USB_HOST,\ USB_HOST_LIBRARIES, DSP_ABSTRACTION, DSP_CMSIS, DSP_LIBRARIES,\ CPPUTEST_SRC,\ @@ -26,20 +26,6 @@ LIBRARIES = [ - # RTOS libraries - { - "id": "rtx", - "source_dir": MBED_RTX, - "build_dir": RTOS_LIBRARIES, - "dependencies": [MBED_LIBRARIES], - }, - { - "id": "rtos", - "source_dir": RTOS, - "build_dir": RTOS_LIBRARIES, - "dependencies": [MBED_LIBRARIES, MBED_RTX], - }, - # RPC { "id": "rpc", diff --git a/tools/make.py b/tools/make.py index abe618c814d..1806158c678 100644 --- a/tools/make.py +++ b/tools/make.py @@ -33,7 +33,6 @@ from tools.utils import NotSupportedException from tools.paths import BUILD_DIR from tools.paths import MBED_LIBRARIES -from tools.paths import RTOS_LIBRARIES from tools.paths import RPC_LIBRARY from tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES from tools.paths import DSP_LIBRARIES @@ -133,11 +132,7 @@ default=False, help="List available tests in order and exit") # Ideally, all the tests with a single "main" thread can be run with, or - # without the rtos, usb_host, usb, dsp - parser.add_argument("--rtos", - action="store_true", dest="rtos", - default=False, help="Link with RTOS library") - + # without the usb_host, usb, dsp parser.add_argument("--rpc", action="store_true", dest="rpc", default=False, help="Link with RPC library") @@ -258,7 +253,6 @@ sys.exit() # Linking with extra libraries - if options.rtos: test.dependencies.append(RTOS_LIBRARIES) if options.rpc: test.dependencies.append(RPC_LIBRARY) if options.usb_host: test.dependencies.append(USB_HOST_LIBRARIES) if options.usb: test.dependencies.append(USB_LIBRARIES) diff --git a/tools/paths.py b/tools/paths.py index 5058bbaabfe..17cc82d571d 100644 --- a/tools/paths.py +++ b/tools/paths.py @@ -55,12 +55,6 @@ RPC_LIBRARY = join(BUILD_DIR, "rpc") -# mbed RTOS -RTOS = join(ROOT, "rtos") -MBED_RTX = join(RTOS, "rtx") - -RTOS_LIBRARIES = join(BUILD_DIR, "rtos") - # DSP DSP = join(LIB_DIR, "dsp") DSP_CMSIS = join(DSP, "cmsis_dsp") diff --git a/tools/tests.py b/tools/tests.py index de409473a76..94c923bfd55 100644 --- a/tools/tests.py +++ b/tools/tests.py @@ -640,181 +640,6 @@ "automated": False }, - # CMSIS RTOS tests - { - "id": "CMSIS_RTOS_1", "description": "Basic", - "source_dir": join(TEST_DIR, "rtos", "cmsis", "basic"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES], - }, - { - "id": "CMSIS_RTOS_2", "description": "Mutex", - "source_dir": join(TEST_DIR, "rtos", "cmsis", "mutex"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES], - }, - { - "id": "CMSIS_RTOS_3", "description": "Semaphore", - "source_dir": join(TEST_DIR, "rtos", "cmsis", "semaphore"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES], - }, - { - "id": "CMSIS_RTOS_4", "description": "Signals", - "source_dir": join(TEST_DIR, "rtos", "cmsis", "signals"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES], - }, - { - "id": "CMSIS_RTOS_5", "description": "Queue", - "source_dir": join(TEST_DIR, "rtos", "cmsis", "queue"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES], - }, - { - "id": "CMSIS_RTOS_6", "description": "Mail", - "source_dir": join(TEST_DIR, "rtos", "cmsis", "mail"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES], - }, - { - "id": "CMSIS_RTOS_7", "description": "Timer", - "source_dir": join(TEST_DIR, "rtos", "cmsis", "timer"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES], - }, - { - "id": "CMSIS_RTOS_8", "description": "ISR", - "source_dir": join(TEST_DIR, "rtos", "cmsis", "isr"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES], - }, - - # mbed RTOS tests - { - "id": "RTOS_1", "description": "Basic thread", - "source_dir": join(TEST_DIR, "rtos", "mbed", "basic"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB], - "automated": True, - #"host_test": "wait_us_auto", - "mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824", - "KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR", - "RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI", - "NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F070RB", "NUCLEO_F207ZG", - "DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG", - "DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303ZE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", "NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F103RB", "DISCO_F746NG", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE", - "EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800", - "NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453", - "NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"], - }, - { - "id": "RTOS_2", "description": "Mutex resource lock", - "source_dir": join(TEST_DIR, "rtos", "mbed", "mutex"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB], - "automated": True, - "mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824", - "KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR", - "RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI", - "NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG", - "DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG", - "DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", "NUCLEO_F446RE", "NUCLEO_F103RB", "DISCO_F746NG", - "NUCLEO_F446ZE", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE", - "EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800", - "NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453", - "NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"], - }, - { - "id": "RTOS_3", "description": "Semaphore resource lock", - "source_dir": join(TEST_DIR, "rtos", "mbed", "semaphore"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB], - "automated": True, - "mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824", - "KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR", - "RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI", - "NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG", - "DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG", - "DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", "NUCLEO_F446RE", "NUCLEO_F446ZE", - "NUCLEO_F103RB", "DISCO_F746NG", - "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE", - "EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800", - "NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453", - "NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"], - }, - { - "id": "RTOS_4", "description": "Signals messaging", - "source_dir": join(TEST_DIR, "rtos", "mbed", "signals"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB], - "automated": True, - "mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824", - "KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR", - "RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI", - "NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG", - "DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG", - "DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", "NUCLEO_F446RE", "NUCLEO_F446ZE", - "NUCLEO_F103RB", "DISCO_F746NG", - "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE", - "EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800", - "NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453", - "NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"], - }, - { - "id": "RTOS_5", "description": "Queue messaging", - "source_dir": join(TEST_DIR, "rtos", "mbed", "queue"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB], - "automated": True, - "mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824", - "KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR", - "RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI", - "NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG", - "DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG", - "DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", - "NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F103RB", "DISCO_F746NG", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE", - "EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800", - "NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453", - "NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"], - }, - { - "id": "RTOS_6", "description": "Mail messaging", - "source_dir": join(TEST_DIR, "rtos", "mbed", "mail"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB], - "automated": True, - "mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824", - "KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR", - "RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI", - "NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG", - "DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG", - "DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", - "NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F103RB", "DISCO_F746NG", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE", - "EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800", - "NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453", - "NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"], - }, - { - "id": "RTOS_7", "description": "Timer", - "source_dir": join(TEST_DIR, "rtos", "mbed", "timer"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB], - "automated": True, - #"host_test": "wait_us_auto", - "mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824", - "KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR", - "RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI", - "NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG", - "DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG", - "DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", - "NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F103RB", "DISCO_F746NG", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE", - "EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800", - "NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453", - "NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"], - }, - { - "id": "RTOS_8", "description": "ISR (Queue)", - "source_dir": join(TEST_DIR, "rtos", "mbed", "isr"), - "dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB], - "automated": True, - "mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824", - "KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR", - "RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI", - "NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG", - "DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG", - "DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", - "NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F103RB", "DISCO_F746NG", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE", - "EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800", - "NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453", - "NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"], - }, - # USB Tests # USB device test list { @@ -1006,7 +831,7 @@ "i2c": ["MBED_A19", "MBED_A20"], "spi": ["MBED_A12"], } -GROUPS["rtos"] = [test["id"] for test in TESTS if test["id"].startswith("RTOS_")] + GROUPS["automated"] = [test["id"] for test in TESTS if test.get("automated", False)] # Look for 'TEST_GROUPS' in mbed_settings.py and update the GROUPS dictionary # with the information in test_groups if found