File tree Expand file tree Collapse file tree 5 files changed +5
-10
lines changed Expand file tree Collapse file tree 5 files changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -282,10 +282,6 @@ if(NOT MBED_IS_NATIVE_BUILD)
282282 # Disable any requested files from the targets/ directory.
283283 mbed_apply_mcu_target_file_disables()
284284endif ()
285-
286- if (CORTEX_CORE_LABEL STREQUAL "" )
287- message (FATAL_ERROR "Could not determine Cortex core type from target labels: ${MBED_TARGET_LABELS} " )
288- endif ()
289285
290286add_subdirectory (cmsis)
291287add_subdirectory (drivers)
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ endif()
3535# (needed for typedefs like mbed_rtos_storage_* used by headers even in bare-metal)
3636target_include_directories (mbed-core-flags
3737 INTERFACE
38- ${CMAKE_CURRENT_LIST_DIR} /../device/rtos/include /RTX/config
38+ ${CMAKE_CURRENT_LIST_DIR} /../device/rtos/include /RTX
3939 ${CMAKE_CURRENT_LIST_DIR} /../CMSIS-RTX/Include
4040)
4141
@@ -51,6 +51,9 @@ if(APPLICATION_PROFILE_CONFIG_FULL)
5151 # RTX source files (only compiled when building with RTOS)
5252 target_sources (mbed-rtos-sources
5353 INTERFACE
54+ ${CMAKE_CURRENT_LIST_DIR} /../device/rtos/source /RTX/mbed_rtos_rtx.c
55+ ${CMAKE_CURRENT_LIST_DIR} /../device/rtos/source /RTX/mbed_rtx_handlers.c
56+ ${CMAKE_CURRENT_LIST_DIR} /../device/rtos/source /RTX/mbed_rtx_idle.cpp
5457 # Old CMSIS-RTOS v1 compatibility layer
5558 ${CMAKE_CURRENT_LIST_DIR} /../device/rtos/source /cmsis_os1.c
5659 # Configuration
Original file line number Diff line number Diff line change 1-
21# CMSIS Version 6
32
43This directory contains
Original file line number Diff line number Diff line change @@ -19,15 +19,11 @@ endif()
1919target_include_directories (mbed-core-flags
2020 INTERFACE
2121 include
22- include /RTX
2322)
2423
2524target_sources (mbed-rtos-sources
2625 INTERFACE
2726 source /mbed_boot.c
28- source /RTX/mbed_rtos_rtx.c
29- source /RTX/mbed_rtx_handlers.c
30- source /RTX/mbed_rtx_idle.cpp
3127)
3228
3329target_compile_definitions (mbed-rtos-flags
Original file line number Diff line number Diff line change 2121
2222#ifndef __ASSEMBLER__
2323#include <stdint.h>
24+ #endif
2425
2526#if defined(TARGET_BEETLE )
2627
You can’t perform that action at this time.
0 commit comments