From ac22225ad9144718078fcb8c2fe7e65a04246151 Mon Sep 17 00:00:00 2001 From: Russ Butler Date: Thu, 31 Aug 2017 19:43:13 -0500 Subject: [PATCH] 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/ rtos/rtx5/TARGET_CORTEX_M/* rtos/rtx4/* rtos/ Is re-arranged to: rtos/TARGET_CORTEX/rtx5/* rtos/TARGET_CORTEX/rtx4/* rtos/TARGET_CORTEX/ 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. --- doxyfile_options | 2 +- doxygen_options.json | 2 +- rtos/{ => TARGET_CORTEX}/mbed_boot.c | 0 rtos/{ => TARGET_CORTEX}/mbed_rtos1_types.h | 0 rtos/{ => TARGET_CORTEX}/mbed_rtos_storage.h | 0 rtos/{rtx5 => TARGET_CORTEX}/mbed_rtx_conf.h | 0 .../mbed_rtx_handlers.c | 0 rtos/{ => TARGET_CORTEX}/rtx4/cmsis_os.h | 0 rtos/{ => TARGET_CORTEX}/rtx4/cmsis_os1.c | 0 .../rtx5}/RTX_Config.c | 0 .../rtx5}/RTX_Config.h | 2 +- .../rtx5}/TARGET_M0/TOOLCHAIN_ARM/irq_cm0.S | 0 .../rtx5}/TARGET_M0/TOOLCHAIN_GCC/irq_cm0.S | 0 .../rtx5}/TARGET_M0/TOOLCHAIN_IAR/irq_cm0.S | 0 .../rtx5}/TARGET_M0P/TOOLCHAIN_ARM/irq_cm0.S | 0 .../rtx5}/TARGET_M0P/TOOLCHAIN_GCC/irq_cm0.S | 0 .../rtx5}/TARGET_M0P/TOOLCHAIN_IAR/irq_cm0.S | 0 .../rtx5}/TARGET_M3/TOOLCHAIN_ARM/irq_cm3.S | 0 .../rtx5}/TARGET_M3/TOOLCHAIN_GCC/irq_cm3.S | 0 .../rtx5}/TARGET_M3/TOOLCHAIN_IAR/irq_cm3.S | 0 .../TOOLCHAIN_ARM/irq_cm4f.S | 0 .../TOOLCHAIN_GCC/irq_cm4f.S | 0 .../TOOLCHAIN_IAR/irq_cm4f.S | 0 .../TESTS/memory/heap_and_stack/main.cpp | 0 .../rtx5}/cmsis_os2.h | 0 .../rtx5}/core_cm.h | 0 .../rtx5}/rt_OsEventObserver.c | 0 .../rtx5}/rt_OsEventObserver.h | 0 .../rtx5}/rtx_delay.c | 0 .../rtx5}/rtx_evflags.c | 0 .../rtx5}/rtx_evr.c | 0 .../rtx5}/rtx_evr.h | 0 .../rtx5}/rtx_kernel.c | 0 .../rtx5}/rtx_lib.c | 0 .../rtx5}/rtx_lib.h | 0 .../rtx5}/rtx_memory.c | 0 .../rtx5}/rtx_mempool.c | 0 .../rtx5}/rtx_msgqueue.c | 0 .../rtx5}/rtx_mutex.c | 0 .../rtx5}/rtx_os.h | 0 .../rtx5}/rtx_semaphore.c | 0 .../rtx5}/rtx_system.c | 0 .../rtx5}/rtx_thread.c | 0 .../rtx5}/rtx_timer.c | 0 tools/targets/__init__.py | 20 +++++++++---------- 45 files changed, 13 insertions(+), 13 deletions(-) rename rtos/{ => TARGET_CORTEX}/mbed_boot.c (100%) rename rtos/{ => TARGET_CORTEX}/mbed_rtos1_types.h (100%) rename rtos/{ => TARGET_CORTEX}/mbed_rtos_storage.h (100%) rename rtos/{rtx5 => TARGET_CORTEX}/mbed_rtx_conf.h (100%) rename rtos/{rtx5 => TARGET_CORTEX}/mbed_rtx_handlers.c (100%) rename rtos/{ => TARGET_CORTEX}/rtx4/cmsis_os.h (100%) rename rtos/{ => TARGET_CORTEX}/rtx4/cmsis_os1.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/RTX_Config.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/RTX_Config.h (99%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_M0/TOOLCHAIN_ARM/irq_cm0.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_M0/TOOLCHAIN_GCC/irq_cm0.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_M0/TOOLCHAIN_IAR/irq_cm0.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_M0P/TOOLCHAIN_ARM/irq_cm0.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_M0P/TOOLCHAIN_GCC/irq_cm0.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_M0P/TOOLCHAIN_IAR/irq_cm0.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_M3/TOOLCHAIN_ARM/irq_cm3.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_M3/TOOLCHAIN_GCC/irq_cm3.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_M3/TOOLCHAIN_IAR/irq_cm3.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/irq_cm4f.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/irq_cm4f.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/irq_cm4f.S (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/TESTS/memory/heap_and_stack/main.cpp (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/cmsis_os2.h (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/core_cm.h (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rt_OsEventObserver.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rt_OsEventObserver.h (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_delay.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_evflags.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_evr.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_evr.h (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_kernel.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_lib.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_lib.h (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_memory.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_mempool.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_msgqueue.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_mutex.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_os.h (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_semaphore.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_system.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_thread.c (100%) rename rtos/{rtx5/TARGET_CORTEX_M => TARGET_CORTEX/rtx5}/rtx_timer.c (100%) diff --git a/doxyfile_options b/doxyfile_options index cab5340a04..33eb3a2478 100644 --- a/doxyfile_options +++ b/doxyfile_options @@ -840,7 +840,7 @@ EXCLUDE_PATTERNS = */tools/* \ */TESTS/* \ */targets/* \ */BUILD/* \ - */rtos/rtx* \ + */rtos/TARGET_CORTEX/rtx* \ */cmsis/* \ */FEATURE_* \ */features/mbedtls/* \ diff --git a/doxygen_options.json b/doxygen_options.json index b55f6013c4..37433da2e8 100644 --- a/doxygen_options.json +++ b/doxygen_options.json @@ -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_*" } diff --git a/rtos/mbed_boot.c b/rtos/TARGET_CORTEX/mbed_boot.c similarity index 100% rename from rtos/mbed_boot.c rename to rtos/TARGET_CORTEX/mbed_boot.c diff --git a/rtos/mbed_rtos1_types.h b/rtos/TARGET_CORTEX/mbed_rtos1_types.h similarity index 100% rename from rtos/mbed_rtos1_types.h rename to rtos/TARGET_CORTEX/mbed_rtos1_types.h diff --git a/rtos/mbed_rtos_storage.h b/rtos/TARGET_CORTEX/mbed_rtos_storage.h similarity index 100% rename from rtos/mbed_rtos_storage.h rename to rtos/TARGET_CORTEX/mbed_rtos_storage.h diff --git a/rtos/rtx5/mbed_rtx_conf.h b/rtos/TARGET_CORTEX/mbed_rtx_conf.h similarity index 100% rename from rtos/rtx5/mbed_rtx_conf.h rename to rtos/TARGET_CORTEX/mbed_rtx_conf.h diff --git a/rtos/rtx5/mbed_rtx_handlers.c b/rtos/TARGET_CORTEX/mbed_rtx_handlers.c similarity index 100% rename from rtos/rtx5/mbed_rtx_handlers.c rename to rtos/TARGET_CORTEX/mbed_rtx_handlers.c diff --git a/rtos/rtx4/cmsis_os.h b/rtos/TARGET_CORTEX/rtx4/cmsis_os.h similarity index 100% rename from rtos/rtx4/cmsis_os.h rename to rtos/TARGET_CORTEX/rtx4/cmsis_os.h diff --git a/rtos/rtx4/cmsis_os1.c b/rtos/TARGET_CORTEX/rtx4/cmsis_os1.c similarity index 100% rename from rtos/rtx4/cmsis_os1.c rename to rtos/TARGET_CORTEX/rtx4/cmsis_os1.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/RTX_Config.c b/rtos/TARGET_CORTEX/rtx5/RTX_Config.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/RTX_Config.c rename to rtos/TARGET_CORTEX/rtx5/RTX_Config.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/RTX_Config.h b/rtos/TARGET_CORTEX/rtx5/RTX_Config.h similarity index 99% rename from rtos/rtx5/TARGET_CORTEX_M/RTX_Config.h rename to rtos/TARGET_CORTEX/rtx5/RTX_Config.h index e161b529e6..1a0ea44b78 100644 --- a/rtos/rtx5/TARGET_CORTEX_M/RTX_Config.h +++ b/rtos/TARGET_CORTEX/rtx5/RTX_Config.h @@ -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 >>> -------------------- diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/irq_cm0.S b/rtos/TARGET_CORTEX/rtx5/TARGET_M0/TOOLCHAIN_ARM/irq_cm0.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/irq_cm0.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_M0/TOOLCHAIN_ARM/irq_cm0.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/irq_cm0.S b/rtos/TARGET_CORTEX/rtx5/TARGET_M0/TOOLCHAIN_GCC/irq_cm0.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/irq_cm0.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_M0/TOOLCHAIN_GCC/irq_cm0.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/irq_cm0.S b/rtos/TARGET_CORTEX/rtx5/TARGET_M0/TOOLCHAIN_IAR/irq_cm0.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/irq_cm0.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_M0/TOOLCHAIN_IAR/irq_cm0.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/irq_cm0.S b/rtos/TARGET_CORTEX/rtx5/TARGET_M0P/TOOLCHAIN_ARM/irq_cm0.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/irq_cm0.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_M0P/TOOLCHAIN_ARM/irq_cm0.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/irq_cm0.S b/rtos/TARGET_CORTEX/rtx5/TARGET_M0P/TOOLCHAIN_GCC/irq_cm0.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/irq_cm0.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_M0P/TOOLCHAIN_GCC/irq_cm0.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/irq_cm0.S b/rtos/TARGET_CORTEX/rtx5/TARGET_M0P/TOOLCHAIN_IAR/irq_cm0.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/irq_cm0.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_M0P/TOOLCHAIN_IAR/irq_cm0.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/irq_cm3.S b/rtos/TARGET_CORTEX/rtx5/TARGET_M3/TOOLCHAIN_ARM/irq_cm3.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/irq_cm3.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_M3/TOOLCHAIN_ARM/irq_cm3.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/irq_cm3.S b/rtos/TARGET_CORTEX/rtx5/TARGET_M3/TOOLCHAIN_GCC/irq_cm3.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/irq_cm3.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_M3/TOOLCHAIN_GCC/irq_cm3.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/irq_cm3.S b/rtos/TARGET_CORTEX/rtx5/TARGET_M3/TOOLCHAIN_IAR/irq_cm3.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/irq_cm3.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_M3/TOOLCHAIN_IAR/irq_cm3.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/irq_cm4f.S b/rtos/TARGET_CORTEX/rtx5/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/irq_cm4f.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/irq_cm4f.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/irq_cm4f.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/irq_cm4f.S b/rtos/TARGET_CORTEX/rtx5/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/irq_cm4f.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/irq_cm4f.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/irq_cm4f.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/irq_cm4f.S b/rtos/TARGET_CORTEX/rtx5/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/irq_cm4f.S similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/irq_cm4f.S rename to rtos/TARGET_CORTEX/rtx5/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/irq_cm4f.S diff --git a/rtos/rtx5/TARGET_CORTEX_M/TESTS/memory/heap_and_stack/main.cpp b/rtos/TARGET_CORTEX/rtx5/TESTS/memory/heap_and_stack/main.cpp similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/TESTS/memory/heap_and_stack/main.cpp rename to rtos/TARGET_CORTEX/rtx5/TESTS/memory/heap_and_stack/main.cpp diff --git a/rtos/rtx5/TARGET_CORTEX_M/cmsis_os2.h b/rtos/TARGET_CORTEX/rtx5/cmsis_os2.h similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/cmsis_os2.h rename to rtos/TARGET_CORTEX/rtx5/cmsis_os2.h diff --git a/rtos/rtx5/TARGET_CORTEX_M/core_cm.h b/rtos/TARGET_CORTEX/rtx5/core_cm.h similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/core_cm.h rename to rtos/TARGET_CORTEX/rtx5/core_cm.h diff --git a/rtos/rtx5/TARGET_CORTEX_M/rt_OsEventObserver.c b/rtos/TARGET_CORTEX/rtx5/rt_OsEventObserver.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rt_OsEventObserver.c rename to rtos/TARGET_CORTEX/rtx5/rt_OsEventObserver.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rt_OsEventObserver.h b/rtos/TARGET_CORTEX/rtx5/rt_OsEventObserver.h similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rt_OsEventObserver.h rename to rtos/TARGET_CORTEX/rtx5/rt_OsEventObserver.h diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_delay.c b/rtos/TARGET_CORTEX/rtx5/rtx_delay.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_delay.c rename to rtos/TARGET_CORTEX/rtx5/rtx_delay.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_evflags.c b/rtos/TARGET_CORTEX/rtx5/rtx_evflags.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_evflags.c rename to rtos/TARGET_CORTEX/rtx5/rtx_evflags.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_evr.c b/rtos/TARGET_CORTEX/rtx5/rtx_evr.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_evr.c rename to rtos/TARGET_CORTEX/rtx5/rtx_evr.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_evr.h b/rtos/TARGET_CORTEX/rtx5/rtx_evr.h similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_evr.h rename to rtos/TARGET_CORTEX/rtx5/rtx_evr.h diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_kernel.c b/rtos/TARGET_CORTEX/rtx5/rtx_kernel.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_kernel.c rename to rtos/TARGET_CORTEX/rtx5/rtx_kernel.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_lib.c b/rtos/TARGET_CORTEX/rtx5/rtx_lib.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_lib.c rename to rtos/TARGET_CORTEX/rtx5/rtx_lib.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_lib.h b/rtos/TARGET_CORTEX/rtx5/rtx_lib.h similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_lib.h rename to rtos/TARGET_CORTEX/rtx5/rtx_lib.h diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_memory.c b/rtos/TARGET_CORTEX/rtx5/rtx_memory.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_memory.c rename to rtos/TARGET_CORTEX/rtx5/rtx_memory.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_mempool.c b/rtos/TARGET_CORTEX/rtx5/rtx_mempool.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_mempool.c rename to rtos/TARGET_CORTEX/rtx5/rtx_mempool.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_msgqueue.c b/rtos/TARGET_CORTEX/rtx5/rtx_msgqueue.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_msgqueue.c rename to rtos/TARGET_CORTEX/rtx5/rtx_msgqueue.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_mutex.c b/rtos/TARGET_CORTEX/rtx5/rtx_mutex.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_mutex.c rename to rtos/TARGET_CORTEX/rtx5/rtx_mutex.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_os.h b/rtos/TARGET_CORTEX/rtx5/rtx_os.h similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_os.h rename to rtos/TARGET_CORTEX/rtx5/rtx_os.h diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_semaphore.c b/rtos/TARGET_CORTEX/rtx5/rtx_semaphore.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_semaphore.c rename to rtos/TARGET_CORTEX/rtx5/rtx_semaphore.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_system.c b/rtos/TARGET_CORTEX/rtx5/rtx_system.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_system.c rename to rtos/TARGET_CORTEX/rtx5/rtx_system.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_thread.c b/rtos/TARGET_CORTEX/rtx5/rtx_thread.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_thread.c rename to rtos/TARGET_CORTEX/rtx5/rtx_thread.c diff --git a/rtos/rtx5/TARGET_CORTEX_M/rtx_timer.c b/rtos/TARGET_CORTEX/rtx5/rtx_timer.c similarity index 100% rename from rtos/rtx5/TARGET_CORTEX_M/rtx_timer.c rename to rtos/TARGET_CORTEX/rtx5/rtx_timer.c diff --git a/tools/targets/__init__.py b/tools/targets/__init__.py index 9d02174234..6d551b368a 100644 --- a/tools/targets/__init__.py +++ b/tools/targets/__init__.py @@ -32,16 +32,16 @@ __all__ = ["target", "TARGETS", "TARGET_MAP", "TARGET_NAMES", "CORE_LABELS", "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"] } ################################################################################