Skip to content

Move Cortex specific RTX behind TARGET_CORTEX #5003

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 1 commit into from
Sep 4, 2017
Merged

Move Cortex specific RTX behind TARGET_CORTEX #5003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion doxyfile_options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ EXCLUDE_PATTERNS = */tools/* \
*/TESTS/* \
*/targets/* \
*/BUILD/* \
*/rtos/rtx* \
*/rtos/TARGET_CORTEX/rtx* \
*/cmsis/* \
*/FEATURE_* \
*/features/mbedtls/* \
Expand Down
2 changes: 1 addition & 1 deletion doxygen_options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"PREDEFINED": "DOXYGEN_ONLY DEVICE_ANALOGIN DEVICE_ANALOGOUT DEVICE_CAN DEVICE_ETHERNET DEVICE_EMAC DEVICE_FLASH DEVICE_I2C DEVICE_I2CSLAVE DEVICE_I2C_ASYNCH DEVICE_INTERRUPTIN DEVICE_LOWPOWERTIMER DEVICE_PORTIN DEVICE_PORTINOUT DEVICE_PORTOUT DEVICE_PWMOUT DEVICE_RTC DEVICE_TRNG DEVICE_SERIAL DEVICE_SERIAL_ASYNCH DEVICE_SERIAL_FC DEVICE_SLEEP DEVICE_SPI DEVICE_SPI_ASYNCH DEVICE_SPISLAVE DEVICE_STORAGE \"MBED_DEPRECATED_SINCE(f, g)=\" \"MBED_ENABLE_IF_CALLBACK_COMPATIBLE(F, M)=\"",
"EXPAND_AS_DEFINED": "",
"SKIP_FUNCTION_MACROS": "NO",
"EXCLUDE_PATTERNS": "*/tools/* */TESTS/* */targets/* */FEATURE_*/* */features/mbedtls/* */features/storage/* */features/unsupported/* */features/filesystem/* */BUILD/* */rtos/rtx*/* */cmsis/* */features/FEATURES_*"
"EXCLUDE_PATTERNS": "*/tools/* */TESTS/* */targets/* */FEATURE_*/* */features/mbedtls/* */features/storage/* */features/unsupported/* */features/filesystem/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/FEATURES_*"
}
0 rtos/mbed_boot.c → rtos/TARGET_CORTEX/mbed_boot.c
View file
Open in desktop
File renamed without changes.
0 rtos/mbed_rtos1_types.h → rtos/TARGET_CORTEX/mbed_rtos1_types.h
View file
Open in desktop
File renamed without changes.
0 rtos/mbed_rtos_storage.h → rtos/TARGET_CORTEX/mbed_rtos_storage.h
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/mbed_rtx_conf.h → rtos/TARGET_CORTEX/mbed_rtx_conf.h
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/mbed_rtx_handlers.c → rtos/TARGET_CORTEX/mbed_rtx_handlers.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx4/cmsis_os.h → rtos/TARGET_CORTEX/rtx4/cmsis_os.h
View file
Open in desktop
File renamed without changes.
0 rtos/rtx4/cmsis_os1.c → rtos/TARGET_CORTEX/rtx4/cmsis_os1.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/RTX_Config.c → rtos/TARGET_CORTEX/rtx5/RTX_Config.c
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion rtos/rtx5/TARGET_CORTEX_M/RTX_Config.h → rtos/TARGET_CORTEX/rtx5/RTX_Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#ifndef RTX_CONFIG_H_
#define RTX_CONFIG_H_

#include "rtx5/mbed_rtx_conf.h"
#include "mbed_rtx_conf.h"

//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------

Expand Down
0 ...ORTEX_M/TARGET_M0/TOOLCHAIN_ARM/irq_cm0.S → ...EX/rtx5/TARGET_M0/TOOLCHAIN_ARM/irq_cm0.S
View file
Open in desktop
File renamed without changes.
0 ...ORTEX_M/TARGET_M0/TOOLCHAIN_GCC/irq_cm0.S → ...EX/rtx5/TARGET_M0/TOOLCHAIN_GCC/irq_cm0.S
View file
Open in desktop
File renamed without changes.
0 ...ORTEX_M/TARGET_M0/TOOLCHAIN_IAR/irq_cm0.S → ...EX/rtx5/TARGET_M0/TOOLCHAIN_IAR/irq_cm0.S
View file
Open in desktop
File renamed without changes.
0 ...RTEX_M/TARGET_M0P/TOOLCHAIN_ARM/irq_cm0.S → ...X/rtx5/TARGET_M0P/TOOLCHAIN_ARM/irq_cm0.S
View file
Open in desktop
File renamed without changes.
0 ...RTEX_M/TARGET_M0P/TOOLCHAIN_GCC/irq_cm0.S → ...X/rtx5/TARGET_M0P/TOOLCHAIN_GCC/irq_cm0.S
View file
Open in desktop
File renamed without changes.
0 ...RTEX_M/TARGET_M0P/TOOLCHAIN_IAR/irq_cm0.S → ...X/rtx5/TARGET_M0P/TOOLCHAIN_IAR/irq_cm0.S
View file
Open in desktop
File renamed without changes.
0 ...ORTEX_M/TARGET_M3/TOOLCHAIN_ARM/irq_cm3.S → ...EX/rtx5/TARGET_M3/TOOLCHAIN_ARM/irq_cm3.S
View file
Open in desktop
File renamed without changes.
0 ...ORTEX_M/TARGET_M3/TOOLCHAIN_GCC/irq_cm3.S → ...EX/rtx5/TARGET_M3/TOOLCHAIN_GCC/irq_cm3.S
View file
Open in desktop
File renamed without changes.
0 ...ORTEX_M/TARGET_M3/TOOLCHAIN_IAR/irq_cm3.S → ...EX/rtx5/TARGET_M3/TOOLCHAIN_IAR/irq_cm3.S
View file
Open in desktop
File renamed without changes.
0 ...ARGET_RTOS_M4_M7/TOOLCHAIN_ARM/irq_cm4f.S → ...ARGET_RTOS_M4_M7/TOOLCHAIN_ARM/irq_cm4f.S
View file
Open in desktop
File renamed without changes.
0 ...ARGET_RTOS_M4_M7/TOOLCHAIN_GCC/irq_cm4f.S → ...ARGET_RTOS_M4_M7/TOOLCHAIN_GCC/irq_cm4f.S
View file
Open in desktop
File renamed without changes.
0 ...ARGET_RTOS_M4_M7/TOOLCHAIN_IAR/irq_cm4f.S → ...ARGET_RTOS_M4_M7/TOOLCHAIN_IAR/irq_cm4f.S
View file
Open in desktop
File renamed without changes.
0 ...EX_M/TESTS/memory/heap_and_stack/main.cpp → ...rtx5/TESTS/memory/heap_and_stack/main.cpp
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/cmsis_os2.h → rtos/TARGET_CORTEX/rtx5/cmsis_os2.h
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/core_cm.h → rtos/TARGET_CORTEX/rtx5/core_cm.h
View file
Open in desktop
File renamed without changes.
0 ...rtx5/TARGET_CORTEX_M/rt_OsEventObserver.c → rtos/TARGET_CORTEX/rtx5/rt_OsEventObserver.c
View file
Open in desktop
File renamed without changes.
0 ...rtx5/TARGET_CORTEX_M/rt_OsEventObserver.h → rtos/TARGET_CORTEX/rtx5/rt_OsEventObserver.h
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_delay.c → rtos/TARGET_CORTEX/rtx5/rtx_delay.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_evflags.c → rtos/TARGET_CORTEX/rtx5/rtx_evflags.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_evr.c → rtos/TARGET_CORTEX/rtx5/rtx_evr.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_evr.h → rtos/TARGET_CORTEX/rtx5/rtx_evr.h
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_kernel.c → rtos/TARGET_CORTEX/rtx5/rtx_kernel.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_lib.c → rtos/TARGET_CORTEX/rtx5/rtx_lib.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_lib.h → rtos/TARGET_CORTEX/rtx5/rtx_lib.h
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_memory.c → rtos/TARGET_CORTEX/rtx5/rtx_memory.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_mempool.c → rtos/TARGET_CORTEX/rtx5/rtx_mempool.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_msgqueue.c → rtos/TARGET_CORTEX/rtx5/rtx_msgqueue.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_mutex.c → rtos/TARGET_CORTEX/rtx5/rtx_mutex.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_os.h → rtos/TARGET_CORTEX/rtx5/rtx_os.h
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_semaphore.c → rtos/TARGET_CORTEX/rtx5/rtx_semaphore.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_system.c → rtos/TARGET_CORTEX/rtx5/rtx_system.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_thread.c → rtos/TARGET_CORTEX/rtx5/rtx_thread.c
View file
Open in desktop
File renamed without changes.
0 rtos/rtx5/TARGET_CORTEX_M/rtx_timer.c → rtos/TARGET_CORTEX/rtx5/rtx_timer.c
View file
Open in desktop
File renamed without changes.
20 changes: 10 additions & 10 deletions tools/targets/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
"CUMULATIVE_ATTRIBUTES", "get_resolution_order"]

CORE_LABELS = {
"Cortex-M0" : ["M0", "CORTEX_M", "LIKE_CORTEX_M0"],
"Cortex-M0+": ["M0P", "CORTEX_M", "LIKE_CORTEX_M0"],
"Cortex-M1" : ["M1", "CORTEX_M", "LIKE_CORTEX_M1"],
"Cortex-M3" : ["M3", "CORTEX_M", "LIKE_CORTEX_M3"],
"Cortex-M4" : ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4"],
"Cortex-M4F" : ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4"],
"Cortex-M7" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7"],
"Cortex-M7F" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7"],
"Cortex-M7FD" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7"],
"Cortex-A9" : ["A9", "CORTEX_A", "LIKE_CORTEX_A9"]
"Cortex-M0" : ["M0", "CORTEX_M", "LIKE_CORTEX_M0", "CORTEX"],
"Cortex-M0+": ["M0P", "CORTEX_M", "LIKE_CORTEX_M0", "CORTEX"],
"Cortex-M1" : ["M1", "CORTEX_M", "LIKE_CORTEX_M1", "CORTEX"],
"Cortex-M3" : ["M3", "CORTEX_M", "LIKE_CORTEX_M3", "CORTEX"],
"Cortex-M4" : ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4", "CORTEX"],
"Cortex-M4F" : ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4", "CORTEX"],
"Cortex-M7" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
"Cortex-M7F" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
"Cortex-M7FD" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
"Cortex-A9" : ["A9", "CORTEX_A", "LIKE_CORTEX_A9", "CORTEX"]
}

################################################################################
Expand Down