Skip to content

Commit 95fe5af

Browse files
committed
Remove MBED_GREENTEA_TEST_BAREMETAL from target.application-profile
MBED_GREENTEA_TEST_BAREMETAL can become deprecated and be removed. The 'auto' option of target.application-profile needn't respect it.
1 parent f164549 commit 95fe5af

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

CMakeLists.txt

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -134,25 +134,11 @@ if(NOT application_profile_config_full AND NOT application_profile_config_bareme
134134
endif()
135135

136136
# mbed-core-flags/mbed-core-sources link mbed-rtos-flags/mbed-rtos-sources or not
137-
if((application_profile_config_auto OR application_profile_config_full) AND
138-
(NOT MBED_ENABLE_OS_INTERNAL_TESTS OR NOT MBED_BUILD_GREENTEA_TESTS OR NOT MBED_GREENTEA_TEST_BAREMETAL))
137+
if(application_profile_config_auto OR application_profile_config_full)
139138
target_link_libraries(mbed-core-flags INTERFACE mbed-rtos-flags)
140139
target_link_libraries(mbed-core-sources INTERFACE mbed-rtos-sources)
141140
endif()
142141

143-
# Check if target.application-profile matches MBED_GREENTEA_TEST_BAREMETAL
144-
if(MBED_ENABLE_OS_INTERNAL_TESTS AND MBED_BUILD_GREENTEA_TESTS)
145-
if(application_profile_config_full AND MBED_GREENTEA_TEST_BAREMETAL)
146-
message(FATAL_ERROR
147-
"target.application-profile (full) doesn't match MBED_GREENTEA_TEST_BAREMETAL (TRUE)"
148-
)
149-
elseif(application_profile_config_baremetal AND NOT MBED_GREENTEA_TEST_BAREMETAL)
150-
message(FATAL_ERROR
151-
"target.application-profile (bare-metal) doesn't match MBED_GREENTEA_TEST_BAREMETAL (FALSE)"
152-
)
153-
endif()
154-
endif()
155-
156142
# Validate selected C library type
157143
# The C library type selected has to match the library that the target can support
158144
if(NOT MBED_IS_NATIVE_BUILD)

targets/targets.json5

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,9 @@
103103
},
104104
"application-profile": {
105105
"help": "Select application profile. Options: auto, full, bare-metal. 'auto' mode will check other build options and resolve to\
106-
'full' mode by default or 'bare-metal' mode, for example, MBED_GREENTEA_TEST_BAREMETAL being ON for Greentea test. 'full' mode\
107-
enables the real-time OS and enables all features of Mbed to be used. 'bare-metal' mode disables the real-time OS, preventing you\
108-
from using threads and libraries that depend on them. 'bare-metal' mode is recommended for target MCUs with small amounts of flash\
109-
and RAM.",
106+
'full' mode by default or 'bare-metal' mode. 'full' mode enables the real-time OS and enables all features of Mbed to be used.\
107+
'bare-metal' mode disables the real-time OS, preventing you from using threads and libraries that depend on them. 'bare-metal'\
108+
mode is recommended for target MCUs with small amounts of flash and RAM.",
110109
"value": "auto"
111110
}
112111
}

0 commit comments

Comments
 (0)