Skip to content

Commit ac22225

Browse files
committed
Move Cortex specific RTX behind TARGET_CORTEX
Update directory structure to include RTX for only cortex targets, and for all cortex targets. This patch accomplishes this by moving mbed-os specific RTX files and RTX itself into rtos/TARGET_CORTEX along with removing TARGET_CORTEX_M from the RTX5 directory. The old directory structure: rtos/rtx5/<mbed-os specific RTX files> rtos/rtx5/TARGET_CORTEX_M/* rtos/rtx4/* rtos/<mbed-os specific RTX files> Is re-arranged to: rtos/TARGET_CORTEX/rtx5/* rtos/TARGET_CORTEX/rtx4/* rtos/TARGET_CORTEX/<mbed-os specific rtx files> This both encapsulates RTX code more cleanly and makes it easier to experiment with non-cortex cmsis-os2 backends, such as a posix based cmsis-os2 backend. Note - A potentially better name for the CORTEX_M directory would be something like FEATURE_RTX5 since this directory only contains RTX5 related files. This cannot be done because there is not an easy way to turn this feature on, since it cannot be done from mbed_lib.json.
1 parent 4978a08 commit ac22225

File tree

45 files changed

+13
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+13
-13
lines changed

doxyfile_options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ EXCLUDE_PATTERNS = */tools/* \
840840
*/TESTS/* \
841841
*/targets/* \
842842
*/BUILD/* \
843-
*/rtos/rtx* \
843+
*/rtos/TARGET_CORTEX/rtx* \
844844
*/cmsis/* \
845845
*/FEATURE_* \
846846
*/features/mbedtls/* \

doxygen_options.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"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)=\"",
99
"EXPAND_AS_DEFINED": "",
1010
"SKIP_FUNCTION_MACROS": "NO",
11-
"EXCLUDE_PATTERNS": "*/tools/* */TESTS/* */targets/* */FEATURE_*/* */features/mbedtls/* */features/storage/* */features/unsupported/* */features/filesystem/* */BUILD/* */rtos/rtx*/* */cmsis/* */features/FEATURES_*"
11+
"EXCLUDE_PATTERNS": "*/tools/* */TESTS/* */targets/* */FEATURE_*/* */features/mbedtls/* */features/storage/* */features/unsupported/* */features/filesystem/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/FEATURES_*"
1212
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

rtos/rtx5/TARGET_CORTEX_M/RTX_Config.h renamed to rtos/TARGET_CORTEX/rtx5/RTX_Config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#ifndef RTX_CONFIG_H_
3131
#define RTX_CONFIG_H_
3232

33-
#include "rtx5/mbed_rtx_conf.h"
33+
#include "mbed_rtx_conf.h"
3434

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

File renamed without changes.

tools/targets/__init__.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
"CUMULATIVE_ATTRIBUTES", "get_resolution_order"]
3333

3434
CORE_LABELS = {
35-
"Cortex-M0" : ["M0", "CORTEX_M", "LIKE_CORTEX_M0"],
36-
"Cortex-M0+": ["M0P", "CORTEX_M", "LIKE_CORTEX_M0"],
37-
"Cortex-M1" : ["M1", "CORTEX_M", "LIKE_CORTEX_M1"],
38-
"Cortex-M3" : ["M3", "CORTEX_M", "LIKE_CORTEX_M3"],
39-
"Cortex-M4" : ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4"],
40-
"Cortex-M4F" : ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4"],
41-
"Cortex-M7" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7"],
42-
"Cortex-M7F" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7"],
43-
"Cortex-M7FD" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7"],
44-
"Cortex-A9" : ["A9", "CORTEX_A", "LIKE_CORTEX_A9"]
35+
"Cortex-M0" : ["M0", "CORTEX_M", "LIKE_CORTEX_M0", "CORTEX"],
36+
"Cortex-M0+": ["M0P", "CORTEX_M", "LIKE_CORTEX_M0", "CORTEX"],
37+
"Cortex-M1" : ["M1", "CORTEX_M", "LIKE_CORTEX_M1", "CORTEX"],
38+
"Cortex-M3" : ["M3", "CORTEX_M", "LIKE_CORTEX_M3", "CORTEX"],
39+
"Cortex-M4" : ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4", "CORTEX"],
40+
"Cortex-M4F" : ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4", "CORTEX"],
41+
"Cortex-M7" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
42+
"Cortex-M7F" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
43+
"Cortex-M7FD" : ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
44+
"Cortex-A9" : ["A9", "CORTEX_A", "LIKE_CORTEX_A9", "CORTEX"]
4545
}
4646

4747
################################################################################

0 commit comments

Comments
 (0)