CMake: Refactor Freescale targets

Refactor all Freescale targets to be CMake buildsystem targets. This removes
the need for checking MBED_TARGET_LABELS repeatedly and allows us to be
more flexible in the way we include MBED_TARGET source in the build.

A side effect of this is it will allow us to support custom targets
without breaking the build for 'standard' targets, as we use CMake's
standard mechanism for adding build rules to the build system, rather
than implementing our own layer of logic to exclude files not needed for
the target being built. Using this approach, if an MBED_TARGET is not
linked to using `target_link_libraries` its source files will not be
added to the build. This means custom target source can be added to the
user's application CMakeLists.txt without polluting the build system
when trying to compile for a standard MBED_TARGET.

Author: hugueskamba

targets/TARGET_Freescale/CMakeLists.txt

@@ -1,18 +1,17 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("KLXX" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_KLXX)
-elseif("MCUXpresso_MCUS" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_MCUXpresso_MCUS)
-endif()
+add_subdirectory(TARGET_KLXX EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_MCUXpresso_MCUS EXCLUDE_FROM_ALL)
 
-target_include_directories(mbed-core
+add_library(mbed-freescale INTERFACE)
+
+target_include_directories(mbed-freescale
     INTERFACE
         .
 )
 
-target_sources(mbed-core
+target_sources(mbed-freescale
     INTERFACE
         USBPhy_Kinetis.cpp
 )

targets/TARGET_Freescale/TARGET_KLXX/CMakeLists.txt

@@ -1,18 +1,17 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("KL25Z" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_KL25Z)
-elseif("KL46Z" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_KL46Z)
-endif()
+add_subdirectory(TARGET_KL25Z EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_KL46Z EXCLUDE_FROM_ALL)
 
-target_include_directories(mbed-core
+add_library(mbed-klxx INTERFACE)
+
+target_include_directories(mbed-klxx
     INTERFACE
         .
 )
 
-target_sources(mbed-core
+target_sources(mbed-klxx
     INTERFACE
         analogin_api.c
         analogout_api.c
@@ -25,3 +24,5 @@ target_sources(mbed-core
         sleep.c
         us_ticker.c
 )
+
+target_link_libraries(mbed-klxx INTERFACE mbed-freescale)

targets/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
@@ -9,19 +9,15 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MKL25Z4.S)
 endif()
 
-set_property(
-    GLOBAL PROPERTY
-    MBED_TARGET_LINKER_FILE
-        ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}
-)
+add_library(mbed-kl25z INTERFACE)
 
-target_include_directories(mbed-core
+target_include_directories(mbed-kl25z
     INTERFACE
         .
         device
 )
 
-target_sources(mbed-core
+target_sources(mbed-kl25z
     INTERFACE
         PeripheralPins.c
         gpio_irq_api.c
@@ -32,3 +28,7 @@ target_sources(mbed-core
         device/system_MKL25Z4.c
         ${STARTUP_FILE}
 )
+
+mbed_set_linker_script(mbed-kl25z ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_link_libraries(mbed-kl25z INTERFACE mbed-klxx)

targets/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
@@ -9,19 +9,15 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MKL46Z4.S)
 endif()
 
-set_property(
-    GLOBAL PROPERTY
-    MBED_TARGET_LINKER_FILE
-        ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}
-)
+add_library(mbed-kl46z INTERFACE)
 
-target_include_directories(mbed-core
+target_include_directories(mbed-kl46z
     INTERFACE
         .
         device
 )
 
-target_sources(mbed-core
+target_sources(mbed-kl46z
     INTERFACE
         PeripheralPins.c
         flash_api.c
@@ -33,3 +29,7 @@ target_sources(mbed-core
         device/system_MKL46Z4.c
         ${STARTUP_FILE}
 )
+
+mbed_set_linker_script(mbed-kl46z ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_link_libraries(mbed-kl46z INTERFACE mbed-klxx)

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/CMakeLists.txt

@@ -1,32 +1,22 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("K66F" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_K66F)
-elseif("K82F" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_K82F)
-elseif("KL27Z" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_KL27Z)
-elseif("KL43Z" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_KL43Z)
-elseif("KW41Z" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_KW41Z)
-elseif("MCU_K22F" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_MCU_K22F)
-elseif("MCU_K64F" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_MCU_K64F)
-endif()
+add_subdirectory(TARGET_K66F EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_K82F EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_KL43Z EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_KW41Z EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_MCU_K22F EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_MCU_K64F EXCLUDE_FROM_ALL)
+add_subdirectory(middleware/wireless/TARGET_FRAMEWORK_5_3_3 EXCLUDE_FROM_ALL)
 
-if("FRAMEWORK_5_3_3" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(middleware/wireless/TARGET_FRAMEWORK_5_3_3)
-endif()
+add_library(mbed-mcuxpresso-mcus INTERFACE)
 
-target_include_directories(mbed-core
+target_include_directories(mbed-mcuxpresso-mcus
     INTERFACE
         api
 )
 
-target_sources(mbed-core
+target_sources(mbed-mcuxpresso-mcus
     INTERFACE
         fsl_common.c
 
@@ -44,3 +34,5 @@ target_sources(mbed-core
         api/rtc_api.c
         api/sleep.c
 )
+
+target_link_libraries(mbed-mcuxpresso-mcus INTERFACE mbed-freescale)

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/CMakeLists.txt

@@ -1,21 +1,7 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("FRDM" IN_LIST MBED_TARGET_LABELS)
-    target_include_directories(mbed-core
-        INTERFACE
-            TARGET_FRDM
-    )
-
-    target_sources(mbed-core
-        INTERFACE
-            TARGET_FRDM/PeripheralPins.c
-            TARGET_FRDM/crc.c
-            TARGET_FRDM/fsl_clock_config.c
-            TARGET_FRDM/fsl_phy.c
-            TARGET_FRDM/mbed_overrides.c
-    )
-endif()
+add_subdirectory(TARGET_FRDM EXCLUDE_FROM_ALL)
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MK66FN2M0xxx18.sct)
@@ -25,20 +11,16 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MK66F18.S)
 endif()
 
-set_property(
-    GLOBAL PROPERTY
-    MBED_TARGET_LINKER_FILE
-        ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}
-)
+add_library(mbed-k66f INTERFACE)
 
-target_include_directories(mbed-core
+target_include_directories(mbed-k66f
     INTERFACE
         .
         device
         drivers
 )
 
-target_sources(mbed-core
+target_sources(mbed-k66f
     INTERFACE
         pwmout_api.c
         serial_api.c
@@ -93,3 +75,7 @@ target_sources(mbed-core
         device/system_MK66F18.c
         ${STARTUP_FILE}
 )
+
+mbed_set_linker_script(mbed-k66f ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_link_libraries(mbed-k66f INTERFACE mbed-mcuxpresso-mcus mbed-frdm-k66f)

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/TARGET_FRDM/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-frdm-k66f INTERFACE)
+
+target_include_directories(mbed-frdm-k66f
+    INTERFACE
+        .
+)
+
+target_sources(mbed-frdm-k66f
+    INTERFACE
+        PeripheralPins.c
+        crc.c
+        fsl_clock_config.c
+        fsl_phy.c
+        mbed_overrides.c
+)

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/CMakeLists.txt

@@ -1,19 +1,7 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("FRDM" IN_LIST MBED_TARGET_LABELS)
-    target_include_directories(mbed-core
-        INTERFACE
-            TARGET_FRDM
-    )
-
-    target_sources(mbed-core
-        INTERFACE
-            TARGET_FRDM/PeripheralPins.c
-            TARGET_FRDM/fsl_clock_config.c
-            TARGET_FRDM/mbed_overrides.c
-    )
-endif()
+add_subdirectory(TARGET_FRDM EXCLUDE_FROM_ALL)
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MK82FN256xxx15.sct)
@@ -23,20 +11,16 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MK82F25615.S)
 endif()
 
-set_property(
-    GLOBAL PROPERTY
-    MBED_TARGET_LINKER_FILE
-        ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}
-)
+add_library(mbed-k82f INTERFACE)
 
-target_include_directories(mbed-core
+target_include_directories(mbed-k82f
     INTERFACE
         .
         device
         drivers
 )
 
-target_sources(mbed-core
+target_sources(mbed-k82f
     INTERFACE
         pwmout_api.c
         serial_api.c
@@ -105,3 +89,7 @@ target_sources(mbed-core
         device/system_MK82F25615.c
         ${STARTUP_FILE}
 )
+
+mbed_set_linker_script(mbed-k82f ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_link_libraries(mbed-k82f INTERFACE mbed-mcuxpresso-mcus mbed-frdm-k82f)

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_FRDM/CMakeLists.txt

@@ -0,0 +1,16 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-frdm-k82f INTERFACE)
+
+target_include_directories(mbed-frdm-k82f
+    INTERFACE
+        .
+)
+
+target_sources(mbed-frdm-k82f
+    INTERFACE
+        PeripheralPins.c
+        fsl_clock_config.c
+        mbed_overrides.c
+)

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/CMakeLists.txt

@@ -1,19 +1,7 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("FRDM" IN_LIST MBED_TARGET_LABELS)
-    target_include_directories(mbed-core
-        INTERFACE
-            TARGET_FRDM
-    )
-
-    target_sources(mbed-core
-        INTERFACE
-            TARGET_FRDM/PeripheralPins.c
-            TARGET_FRDM/fsl_clock_config.c
-            TARGET_FRDM/mbed_overrides.c
-    )
-endif()
+add_subdirectory(TARGET_FRDM EXCLUDE_FROM_ALL)
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MKL43Z256xxx4.sct)
@@ -23,20 +11,16 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MKL43Z4.S)
 endif()
 
-set_property(
-    GLOBAL PROPERTY
-    MBED_TARGET_LINKER_FILE
-        ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}
-)
+add_library(mbed-kl43z INTERFACE)
 
-target_include_directories(mbed-core
+target_include_directories(mbed-kl43z
     INTERFACE
         .
         device
         drivers
 )
 
-target_sources(mbed-core
+target_sources(mbed-kl43z
     INTERFACE
         pwmout_api.c
         serial_api.c
@@ -85,3 +69,9 @@ target_sources(mbed-core
         device/system_MKL43Z4.c
         ${STARTUP_FILE}
 )
+
+target_link_libraries(mbed-kl43z INTERFACE mbed-mcuxpresso-mcus)
+
+mbed_set_linker_script(mbed-kl43z ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_link_libraries(mbed-kl43z INTERFACE mbed-frdm-kl43z)