Fix application profile link mess (#410)

ccli8 · web-flow · commit a468f2782074 · 2025-01-18T12:43:38.000-08:00
* Fix mbed-rtos-flags/mbed-rtos-sources typo

* Fix parameter order error to mbed_setup_linker_script

* Support application profile link selection

This provides one approach to address cmake link mess with
mbed-core-flags/mbed-rtos-flags whose links or not depends on selected
application profile, full or bare-metal.
1.  Add target config option application-profile for application to
    select which application profile to use. Applications are responsible
    for making this target config option consitent with link selection of
    mbed-os/mbed-baremetal.
2.  Overload mbed-core-flags/mbed-core-sources so that they can involve
    mbed-rtos-flags/mbed-rtos-sources or not depending on
    target.application-profile setting

* Guard from mismatch of target.application-profile and mbed-os/mbed-baremetal

This guards from mismatch of target.application-profile and link
libraries mbed-os/mbed-baremetal.

* Make all libraries link mbed-core-flags instead of mbed-rtos-flags

With mbed-core-flags overloaded to match target.application-profile setting,
all libraries should link mbed-core-flags instead of mbed-rtos-flags so that
they build upon correct application profile, involving mbed-rtos-flags or not.

* Make mbed-os link mbed-core-flags/mbed-core-sources only

With mbed-core-flags/mbed-core-sources being overloaded to match
target.application-profile setting, mbed-os should link only
mbed-core-flags/mbed-core-sources which will involve mbed-rtos-flags/
mbed-rtos-sources as config.

* 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.

* Respect target.application-profile setting for Greentea build

MBED_GREENTEA_TEST_BAREMETAL can become deprecated and be removed.
Respect target.application-profile setting instead to resolve link
library.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -116,10 +116,28 @@ endif()
 # These targets are made visible here so their source files which
 # are spread in different directories can be referenced and can be linked against
 # by libraries that depend on them.
-add_library(mbed-rtos-flags INTERFACE) # Collects source files that are in mbed-os but not mbed-baremetal
-add_library(mbed-rtos-sources INTERFACE) # Collects flags that are in mbed-os but not mbed-baremetal
-add_library(mbed-core-flags INTERFACE) # Collects flags common to mbed-baremetal and mbed-os
-add_library(mbed-core-sources INTERFACE) # Collects source files common to mbed-baremetal and mbed-os
+add_library(mbed-rtos-flags INTERFACE) # Collects flags that are in mbed-os but not mbed-baremetal
+add_library(mbed-rtos-sources INTERFACE) # Collects source files that are in mbed-os but not mbed-baremetal
+add_library(mbed-core-flags INTERFACE) # Collects flags that are in mbed-os or mbed-baremetal
+                                       # depending on target.application-profile setting
+add_library(mbed-core-sources INTERFACE) # Collects source files that are in mbed-os or mbed-baremetal
+                                         # depending on target.application-profile setting
+
+if("MBED_CONF_TARGET_APPLICATION_PROFILE=full" IN_LIST MBED_CONFIG_DEFINITIONS)
+    set(APPLICATION_PROFILE_CONFIG_FULL TRUE)
+endif()
+if("MBED_CONF_TARGET_APPLICATION_PROFILE=bare-metal" IN_LIST MBED_CONFIG_DEFINITIONS)
+    set(APPLICATION_PROFILE_CONFIG_BAREMETAL TRUE)
+endif()
+if(NOT APPLICATION_PROFILE_CONFIG_FULL AND NOT APPLICATION_PROFILE_CONFIG_BAREMETAL)
+    set(APPLICATION_PROFILE_CONFIG_AUTO TRUE)
+endif()
+
+# mbed-core-flags/mbed-core-sources link mbed-rtos-flags/mbed-rtos-sources or not
+if(APPLICATION_PROFILE_CONFIG_AUTO OR APPLICATION_PROFILE_CONFIG_FULL)
+    target_link_libraries(mbed-core-flags INTERFACE mbed-rtos-flags)
+    target_link_libraries(mbed-core-sources INTERFACE mbed-rtos-sources)
+endif()
 
 # Validate selected C library type
 # The C library type selected has to match the library that the target can support
@@ -282,10 +300,10 @@ if(NOT MBED_IS_NATIVE_BUILD)
     # Note that many different source files will compile differently depending on if the RTOS is in use.
     # So, it's needed to compile the core sources twice, once for RTOS and once for non-RTOS.
     mbed_create_distro(mbed-baremetal ${MBED_TARGET_CMAKE_NAME} mbed-core-flags mbed-core-sources)
-    mbed_create_distro(mbed-os ${MBED_TARGET_CMAKE_NAME} mbed-core-flags mbed-core-sources mbed-rtos-flags mbed-rtos-sources)
+    mbed_create_distro(mbed-os ${MBED_TARGET_CMAKE_NAME} mbed-core-flags mbed-core-sources)
 
     # Set up the linker script and hook it up to the top-level OS targets
-    mbed_setup_linker_script(mbed-baremetal mbed-os ${CMAKE_CURRENT_BINARY_DIR}/generated-headers/mbed-target-config.h)
+    mbed_setup_linker_script(mbed-os mbed-baremetal ${CMAKE_CURRENT_BINARY_DIR}/generated-headers/mbed-target-config.h)
 
     # Make sure that things linking mbed-core-flags can also get the target-specific include dirs and flags.
     mbed_extract_flags(${MBED_TARGET_CMAKE_NAME}-flags ${MBED_TARGET_CMAKE_NAME})
diff --git a/TESTS/configs/greentea_baremetal.json5 b/TESTS/configs/greentea_baremetal.json5
@@ -1,7 +1,8 @@
 {
     "target_overrides": {
         "*": {
-            "target.c_lib": "small"
+            "target.c_lib": "small",
+            "target.application-profile": "bare-metal"
         }
     },
     "overrides": {
diff --git a/connectivity/cellular/CMakeLists.txt b/connectivity/cellular/CMakeLists.txt
@@ -39,6 +39,5 @@ target_link_libraries(mbed-cellular
     PUBLIC
         mbed-netsocket-api
         mbed-core-flags
-        mbed-rtos-flags
         mbed-randlib
 )
diff --git a/connectivity/drivers/802.15.4_RF/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/CMakeLists.txt
@@ -7,7 +7,7 @@ macro(create_mbed_802_15_4_target)
 		add_library(mbed-802.15.4-rf STATIC EXCLUDE_FROM_ALL)
 
 		# Nanostack drivers always require Mbed RTOS
-		target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-core-flags mbed-rtos-flags)
+		target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-core-flags)
 
 		# For NanostackRfPhy.h
 		target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-nanostack)
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt
@@ -8,8 +8,7 @@ target_link_libraries(mbed-bluenrg2
     PUBLIC
         mbed-core-flags
         mbed-ble
-    PRIVATE
-        mbed-rtos-flags)
+)
 
 # circular dependency between mbed-ble and the BlueNRG driver, because of the ble_cordio_get_hci_driver() implementation
 target_link_libraries(mbed-ble PUBLIC mbed-bluenrg2)
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt
@@ -8,8 +8,7 @@ target_link_libraries(mbed-bluenrg-ms
     PUBLIC
         mbed-core-flags
         mbed-ble
-    PRIVATE
-        mbed-rtos-flags)
+)
 
 
 # circular dependency between mbed-ble and the BlueNRG driver, because of the ble_cordio_get_hci_driver() implementation
diff --git a/connectivity/drivers/emac/CMakeLists.txt b/connectivity/drivers/emac/CMakeLists.txt
@@ -33,5 +33,5 @@ target_link_libraries(mbed-emac
     PUBLIC
         mbed-netsocket-api
     PRIVATE
-        mbed-rtos-flags
+        mbed-core-flags
 )
diff --git a/connectivity/drivers/wifi/CMakeLists.txt b/connectivity/drivers/wifi/CMakeLists.txt
@@ -8,7 +8,7 @@ macro(create_mbed_wifi_target)
 
 		target_link_libraries(mbed-wifi
 		    PUBLIC
-		        mbed-rtos-flags
+		        mbed-core-flags
 		        mbed-netsocket-api
 		)
 	endif()
diff --git a/connectivity/drivers/wifi/COMPONENT_WHD/whd-bsp-integration/CMakeLists.txt b/connectivity/drivers/wifi/COMPONENT_WHD/whd-bsp-integration/CMakeLists.txt
@@ -15,7 +15,7 @@ target_sources(mbed-wifi
 target_link_libraries(mbed-wifi
     PUBLIC
         mbed-lwipstack
-		mbed-rtos-flags
+		mbed-core-flags
 )
 
 if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)
diff --git a/connectivity/libraries/ppp/CMakeLists.txt b/connectivity/libraries/ppp/CMakeLists.txt
@@ -57,5 +57,5 @@ target_link_libraries(mbed-ppp
     PUBLIC
         mbed-netsocket-api
     PRIVATE
-        mbed-rtos-flags
+        mbed-core-flags
 )
diff --git a/connectivity/lwipstack/CMakeLists.txt b/connectivity/lwipstack/CMakeLists.txt
@@ -100,6 +100,6 @@ target_link_libraries(mbed-lwipstack
         mbed-ppp
         mbed-randlib
     PRIVATE
-        mbed-rtos-flags
+        mbed-core-flags
 )
 
diff --git a/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt b/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt
@@ -37,8 +37,6 @@ target_link_libraries(mbed-nanostack-mbed_mesh_api
 		mbed-nanostack
         mbed-netsocket-api
         mbed-core-flags
-    PRIVATE
-        mbed-rtos-flags
 )
 
 # Since there are a lot of circular references between this library and mbed-netsocket-api,
diff --git a/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
@@ -29,6 +29,4 @@ target_link_libraries(mbed-nanostack-hal_mbed_cmsis_rtos
         mbed-nanostack-sal_stack-event_loop
         mbed-nanostack-libservice
         mbed-nanostack-sal_stack
-    PRIVATE
-        mbed-rtos-flags
 )
diff --git a/connectivity/netsocket/tests/emac_test_utils/CMakeLists.txt b/connectivity/netsocket/tests/emac_test_utils/CMakeLists.txt
@@ -8,7 +8,6 @@ target_sources(mbed-emac-test-utils PRIVATE
 target_include_directories(mbed-emac-test-utils PUBLIC .)
 target_link_libraries(mbed-emac-test-utils PUBLIC
     mbed-core-flags
-    mbed-rtos-flags
     mbed-netsocket-api
 	mbed-nanostack-libservice
 	mbed-nanostack-hal_mbed_cmsis_rtos)
diff --git a/drivers/usb/CMakeLists.txt b/drivers/usb/CMakeLists.txt
@@ -56,5 +56,5 @@ if("DEVICE_USBDEVICE=1" IN_LIST MBED_TARGET_DEFINITIONS)
             include/usb/cdc_ecm
     )
 
-    target_link_libraries(mbed-usb-cdc-ecm PUBLIC mbed-usb mbed-rtos-flags)
+    target_link_libraries(mbed-usb-cdc-ecm PUBLIC mbed-usb mbed-core-flags)
 endif()
diff --git a/targets/targets.json5 b/targets/targets.json5
@@ -100,6 +100,13 @@
             "semihosting-enabled": {
                 "help": "Enable ARM Semihosting protocol.  This uses a magic breakpoint instruction to enable the MCU to print data to and access files on a host machine.  However, it can interfere with debuggers that are not semihost aware.",
                 "value": false
+            },
+            "application-profile": {
+                "help": "Select application profile. Options: auto, full, bare-metal. 'auto' mode will check other build options and resolve to\
+                'full' mode by default or 'bare-metal' mode. 'full' mode enables the real-time OS and enables all features of Mbed to be used.\
+                'bare-metal' mode disables the real-time OS, preventing you from using threads and libraries that depend on them. 'bare-metal'\
+                mode is recommended for target MCUs with small amounts of flash and RAM.",
+                "value": "auto"
             }
         }
     },
diff --git a/tools/cmake/mbed_greentea.cmake b/tools/cmake/mbed_greentea.cmake
@@ -92,7 +92,9 @@ function(mbed_greentea_add_test)
             ${MBED_GREENTEA_TEST_SOURCES}
     )
 
-    if(MBED_GREENTEA_TEST_BAREMETAL)
+    # Resolve link library based on target.application-profile setting
+    get_target_property(MBED_CORE_FLAGS_TARGET_LINK_LIBRARIES mbed-core-flags INTERFACE_LINK_LIBRARIES)
+    if(NOT "mbed-rtos-flags" IN_LIST MBED_CORE_FLAGS_TARGET_LINK_LIBRARIES)
         list(APPEND MBED_GREENTEA_TEST_REQUIRED_LIBS mbed-baremetal)
     else()
         list(APPEND MBED_GREENTEA_TEST_REQUIRED_LIBS mbed-os)
diff --git a/tools/cmake/mbed_target_functions.cmake b/tools/cmake/mbed_target_functions.cmake
@@ -136,9 +136,20 @@ function(mbed_set_post_build target)
     if (NOT MBED_IS_STANDALONE)
         if("${ARGN}" STREQUAL "")
             get_target_property(POST_BUILD_TARGET_LINK_LIBRARIES ${target} LINK_LIBRARIES)
+            get_target_property(MBED_CORE_FLAGS_TARGET_LINK_LIBRARIES mbed-core-flags INTERFACE_LINK_LIBRARIES)
             if("mbed-os" IN_LIST POST_BUILD_TARGET_LINK_LIBRARIES)
+                if(NOT "mbed-rtos-flags" IN_LIST MBED_CORE_FLAGS_TARGET_LINK_LIBRARIES)
+                    message(FATAL_ERROR
+                        "Target ${target} links to mbed-os, but Mbed is configured for a baremetal build. Please set \"target.application-profile\": \"full\" in JSON to enable the mbed-os target, or link your application to mbed-baremetal instead of mbed-os."
+                    )
+                endif()
                 get_target_property(LINKER_SCRIPT_PATH mbed-os LINKER_SCRIPT_PATH)
             elseif("mbed-baremetal" IN_LIST POST_BUILD_TARGET_LINK_LIBRARIES)
+                if("mbed-rtos-flags" IN_LIST MBED_CORE_FLAGS_TARGET_LINK_LIBRARIES)
+                    message(FATAL_ERROR
+                        "Target ${target} links to mbed-baremetal, but Mbed is configured for a full build. Please set \"target.application-profile\": \"bare-metal\" in JSON to enable the mbed-baremetal target, or link your application to mbed-os instead of mbed-baremetal."
+                    )
+                endif()
                 get_target_property(LINKER_SCRIPT_PATH mbed-baremetal LINKER_SCRIPT_PATH)
             else()
                 message(FATAL_ERROR "Target ${target} used with mbed_set_post_build() but does not link to mbed-os or mbed-baremetal!")

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"target_overrides": {`
`3`	`3`	`"*": {`
`4`		`- "target.c_lib": "small"`
	`4`	`+ "target.c_lib": "small",`
	`5`	`+ "target.application-profile": "bare-metal"`
`5`	`6`	`}`
`6`	`7`	`},`
`7`	`8`	`"overrides": {`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,5 @@ target_link_libraries(mbed-cellular`
`39`	`39`	`PUBLIC`
`40`	`40`	`mbed-netsocket-api`
`41`	`41`	`mbed-core-flags`
`42`		`- mbed-rtos-flags`
`43`	`42`	`mbed-randlib`
`44`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ target_link_libraries(mbed-emac`
`33`	`33`	`PUBLIC`
`34`	`34`	`mbed-netsocket-api`
`35`	`35`	`PRIVATE`
`36`		`- mbed-rtos-flags`
	`36`	`+ mbed-core-flags`
`37`	`37`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ macro(create_mbed_wifi_target)`
`8`	`8`
`9`	`9`	`target_link_libraries(mbed-wifi`
`10`	`10`	`PUBLIC`
`11`		`- mbed-rtos-flags`
	`11`	`+ mbed-core-flags`
`12`	`12`	`mbed-netsocket-api`
`13`	`13`	`)`
`14`	`14`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ target_sources(mbed-wifi`
`15`	`15`	`target_link_libraries(mbed-wifi`
`16`	`16`	`PUBLIC`
`17`	`17`	`mbed-lwipstack`
`18`		`- mbed-rtos-flags`
	`18`	`+ mbed-core-flags`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,5 @@ target_link_libraries(mbed-ppp`
`57`	`57`	`PUBLIC`
`58`	`58`	`mbed-netsocket-api`
`59`	`59`	`PRIVATE`
`60`		`- mbed-rtos-flags`
	`60`	`+ mbed-core-flags`
`61`	`61`	`)`