mbed-ce · multiplemonomials · Feb 9, 2024 · Feb 5, 2024 · Feb 5, 2024 · Feb 6, 2024
diff --git a/connectivity/drivers/802.15.4_RF/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/CMakeLists.txt
@@ -1,22 +1,43 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-802.15.4-rf STATIC EXCLUDE_FROM_ALL)
+# The 'mbed-802.15.4-rf' target is lazily created because there might not be any subdirectories needing it at all.
+macro(create_802_15_4_target)
+	if(NOT TARGET create_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-nanostack
+		    INTERFACE
+		        mbed-802.15.4-rf
+		)
+	endif()
+endmacro()
 
-target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-core-flags)
 
 if("Freescale" IN_LIST MBED_TARGET_LABELS)
+	create_802_15_4_target()
     add_subdirectory(TARGET_Freescale)
-    add_subdirectory(mcr20a-rf-driver)
 elseif("Silicon_Labs" IN_LIST MBED_TARGET_LABELS)
+	create_802_15_4_target()
     add_subdirectory(TARGET_Silicon_Labs)
-elseif("STM" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(stm-s2lp-rf-driver)
 endif()
 
-add_subdirectory(atmel-rf-driver)
+if("COMPONENT_MICROCHIP_AT86RF=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	create_802_15_4_target()
+	add_subdirectory(COMPONENT_MICROCHIP_AT86RF)
+endif()
+
+if("COMPONENT_NXP_MCR20A=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	create_802_15_4_target()
+	add_subdirectory(COMPONENT_NXP_MCR20A)
+endif()
+
+if("COMPONENT_STM_S2_LP=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	create_802_15_4_target()
+	add_subdirectory(COMPONENT_STM_S2_LP)
+endif()
+
 
-target_link_libraries(mbed-nanostack
-    INTERFACE
-        mbed-802.15.4-rf
-)
diff --git a/...02.15.4_RF/atmel-rf-driver/CMakeLists.txt → ...COMPONENT_MICROCHIP_AT86RF/CMakeLists.txt b/...02.15.4_RF/atmel-rf-driver/CMakeLists.txt → ...COMPONENT_MICROCHIP_AT86RF/CMakeLists.txt
diff --git a/...ivers/802.15.4_RF/atmel-rf-driver/LICENSE → ...5.4_RF/COMPONENT_MICROCHIP_AT86RF/LICENSE b/...ivers/802.15.4_RF/atmel-rf-driver/LICENSE → ...5.4_RF/COMPONENT_MICROCHIP_AT86RF/LICENSE
diff --git a/...ers/802.15.4_RF/atmel-rf-driver/README.md → ...4_RF/COMPONENT_MICROCHIP_AT86RF/README.md b/...ers/802.15.4_RF/atmel-rf-driver/README.md → ...4_RF/COMPONENT_MICROCHIP_AT86RF/README.md
diff --git a/...02.15.4_RF/atmel-rf-driver/apache-2.0.txt → ...COMPONENT_MICROCHIP_AT86RF/apache-2.0.txt b/...02.15.4_RF/atmel-rf-driver/apache-2.0.txt → ...COMPONENT_MICROCHIP_AT86RF/apache-2.0.txt
diff --git a/...ver/atmel-rf-driver/NanostackRfPhyAtmel.h → ...6RF/atmel-rf-driver/NanostackRfPhyAtmel.h b/...ver/atmel-rf-driver/NanostackRfPhyAtmel.h → ...6RF/atmel-rf-driver/NanostackRfPhyAtmel.h
diff --git a/...802.15.4_RF/atmel-rf-driver/mbed_lib.json → .../COMPONENT_MICROCHIP_AT86RF/mbed_lib.json b/...802.15.4_RF/atmel-rf-driver/mbed_lib.json → .../COMPONENT_MICROCHIP_AT86RF/mbed_lib.json
diff --git a/..._RF/atmel-rf-driver/source/AT86RF215Reg.h → ...NT_MICROCHIP_AT86RF/source/AT86RF215Reg.h b/..._RF/atmel-rf-driver/source/AT86RF215Reg.h → ...NT_MICROCHIP_AT86RF/source/AT86RF215Reg.h
diff --git a/...5.4_RF/atmel-rf-driver/source/AT86RFReg.h → ...ONENT_MICROCHIP_AT86RF/source/AT86RFReg.h b/...5.4_RF/atmel-rf-driver/source/AT86RFReg.h → ...ONENT_MICROCHIP_AT86RF/source/AT86RFReg.h
diff --git a/...driver/source/NanostackRfPhyAT86RF215.cpp → ...AT86RF/source/NanostackRfPhyAT86RF215.cpp b/...driver/source/NanostackRfPhyAT86RF215.cpp → ...AT86RF/source/NanostackRfPhyAT86RF215.cpp
diff --git a/...-rf-driver/source/NanostackRfPhyAtmel.cpp → ...HIP_AT86RF/source/NanostackRfPhyAtmel.cpp b/...-rf-driver/source/NanostackRfPhyAtmel.cpp → ...HIP_AT86RF/source/NanostackRfPhyAtmel.cpp
diff --git a/...5.4_RF/atmel-rf-driver/source/at24mac.cpp → ...ONENT_MICROCHIP_AT86RF/source/at24mac.cpp b/...5.4_RF/atmel-rf-driver/source/at24mac.cpp → ...ONENT_MICROCHIP_AT86RF/source/at24mac.cpp
diff --git a/....15.4_RF/atmel-rf-driver/source/at24mac.h → ...MPONENT_MICROCHIP_AT86RF/source/at24mac.h b/....15.4_RF/atmel-rf-driver/source/at24mac.h → ...MPONENT_MICROCHIP_AT86RF/source/at24mac.h
diff --git a/...2.15.4_RF/atmel-rf-driver/source/rfbits.h → ...OMPONENT_MICROCHIP_AT86RF/source/rfbits.h b/...2.15.4_RF/atmel-rf-driver/source/rfbits.h → ...OMPONENT_MICROCHIP_AT86RF/source/rfbits.h
diff --git a/...2.15.4_RF/mcr20a-rf-driver/CMakeLists.txt → ....4_RF/COMPONENT_NXP_MCR20A/CMakeLists.txt b/...2.15.4_RF/mcr20a-rf-driver/CMakeLists.txt → ....4_RF/COMPONENT_NXP_MCR20A/CMakeLists.txt
diff --git a/...vers/802.15.4_RF/mcr20a-rf-driver/LICENSE → .../802.15.4_RF/COMPONENT_NXP_MCR20A/LICENSE b/...vers/802.15.4_RF/mcr20a-rf-driver/LICENSE → .../802.15.4_RF/COMPONENT_NXP_MCR20A/LICENSE
diff --git a/...rs/802.15.4_RF/mcr20a-rf-driver/README.md → ...02.15.4_RF/COMPONENT_NXP_MCR20A/README.md b/...rs/802.15.4_RF/mcr20a-rf-driver/README.md → ...02.15.4_RF/COMPONENT_NXP_MCR20A/README.md
diff --git a/...2.15.4_RF/mcr20a-rf-driver/apache-2.0.txt → ....4_RF/COMPONENT_NXP_MCR20A/apache-2.0.txt b/...2.15.4_RF/mcr20a-rf-driver/apache-2.0.txt → ....4_RF/COMPONENT_NXP_MCR20A/apache-2.0.txt
diff --git a/...02.15.4_RF/mcr20a-rf-driver/mbed_lib.json → ...5.4_RF/COMPONENT_NXP_MCR20A/mbed_lib.json b/...02.15.4_RF/mcr20a-rf-driver/mbed_lib.json → ...5.4_RF/COMPONENT_NXP_MCR20A/mbed_lib.json
diff --git a/...r/mcr20a-rf-driver/NanostackRfPhyMcr20a.h → ...A/mcr20a-rf-driver/NanostackRfPhyMcr20a.h b/...r/mcr20a-rf-driver/NanostackRfPhyMcr20a.h → ...A/mcr20a-rf-driver/NanostackRfPhyMcr20a.h
diff --git a/...5.4_RF/mcr20a-rf-driver/source/MCR20Drv.c → ...RF/COMPONENT_NXP_MCR20A/source/MCR20Drv.c b/...5.4_RF/mcr20a-rf-driver/source/MCR20Drv.c → ...RF/COMPONENT_NXP_MCR20A/source/MCR20Drv.c
diff --git a/...5.4_RF/mcr20a-rf-driver/source/MCR20Drv.h → ...RF/COMPONENT_NXP_MCR20A/source/MCR20Drv.h b/...5.4_RF/mcr20a-rf-driver/source/MCR20Drv.h → ...RF/COMPONENT_NXP_MCR20A/source/MCR20Drv.h
diff --git a/...mcr20a-rf-driver/source/MCR20Overwrites.h → ...ONENT_NXP_MCR20A/source/MCR20Overwrites.h b/...mcr20a-rf-driver/source/MCR20Overwrites.h → ...ONENT_NXP_MCR20A/source/MCR20Overwrites.h
diff --git a/...5.4_RF/mcr20a-rf-driver/source/MCR20Reg.h → ...RF/COMPONENT_NXP_MCR20A/source/MCR20Reg.h b/...5.4_RF/mcr20a-rf-driver/source/MCR20Reg.h → ...RF/COMPONENT_NXP_MCR20A/source/MCR20Reg.h
diff --git a/...rf-driver/source/NanostackRfPhyMcr20a.cpp → ...XP_MCR20A/source/NanostackRfPhyMcr20a.cpp b/...rf-driver/source/NanostackRfPhyMcr20a.cpp → ...XP_MCR20A/source/NanostackRfPhyMcr20a.cpp
diff --git a/...15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h → ..._RF/COMPONENT_NXP_MCR20A/source/XcvrSpi.h b/...15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h → ..._RF/COMPONENT_NXP_MCR20A/source/XcvrSpi.h
diff --git a/...15.4_RF/stm-s2lp-rf-driver/CMakeLists.txt → ...5.4_RF/COMPONENT_STM_S2_LP/CMakeLists.txt b/...15.4_RF/stm-s2lp-rf-driver/CMakeLists.txt → ...5.4_RF/COMPONENT_STM_S2_LP/CMakeLists.txt
diff --git a/.../802.15.4_RF/stm-s2lp-rf-driver/README.md → ...802.15.4_RF/COMPONENT_STM_S2_LP/README.md b/.../802.15.4_RF/stm-s2lp-rf-driver/README.md → ...802.15.4_RF/COMPONENT_STM_S2_LP/README.md
diff --git a/....15.4_RF/stm-s2lp-rf-driver/mbed_lib.json → ...15.4_RF/COMPONENT_STM_S2_LP/mbed_lib.json b/....15.4_RF/stm-s2lp-rf-driver/mbed_lib.json → ...15.4_RF/COMPONENT_STM_S2_LP/mbed_lib.json
diff --git a/...p-rf-driver/source/NanostackRfPhys2lp.cpp → ...T_STM_S2_LP/source/NanostackRfPhys2lp.cpp b/...p-rf-driver/source/NanostackRfPhys2lp.cpp → ...T_STM_S2_LP/source/NanostackRfPhys2lp.cpp
diff --git a/...tm-s2lp-rf-driver/source/at24mac_s2lp.cpp → ...MPONENT_STM_S2_LP/source/at24mac_s2lp.cpp b/...tm-s2lp-rf-driver/source/at24mac_s2lp.cpp → ...MPONENT_STM_S2_LP/source/at24mac_s2lp.cpp
diff --git a/.../stm-s2lp-rf-driver/source/at24mac_s2lp.h → ...COMPONENT_STM_S2_LP/source/at24mac_s2lp.h b/.../stm-s2lp-rf-driver/source/at24mac_s2lp.h → ...COMPONENT_STM_S2_LP/source/at24mac_s2lp.h
diff --git a/...-s2lp-rf-driver/source/rf_configuration.c → ...ONENT_STM_S2_LP/source/rf_configuration.c b/...-s2lp-rf-driver/source/rf_configuration.c → ...ONENT_STM_S2_LP/source/rf_configuration.c
diff --git a/...-s2lp-rf-driver/source/rf_configuration.h → ...ONENT_STM_S2_LP/source/rf_configuration.h b/...-s2lp-rf-driver/source/rf_configuration.h → ...ONENT_STM_S2_LP/source/rf_configuration.h
diff --git a/....4_RF/stm-s2lp-rf-driver/source/s2lpReg.h → ...4_RF/COMPONENT_STM_S2_LP/source/s2lpReg.h b/....4_RF/stm-s2lp-rf-driver/source/s2lpReg.h → ...4_RF/COMPONENT_STM_S2_LP/source/s2lpReg.h
diff --git a/...r/stm-s2lp-rf-driver/NanostackRfPhys2lp.h → ...P/stm-s2lp-rf-driver/NanostackRfPhys2lp.h b/...r/stm-s2lp-rf-driver/NanostackRfPhys2lp.h → ...P/stm-s2lp-rf-driver/NanostackRfPhys2lp.h
diff --git a/connectivity/drivers/cellular/Altair/CMakeLists.txt b/connectivity/drivers/cellular/Altair/CMakeLists.txt
@@ -1,4 +1,6 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(ALT1250)
+if("COMPONENT_ALTAIR_ALT1250=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(COMPONENT_ALTAIR_ALT1250)
+endif()
diff --git a/...rs/cellular/Altair/ALT1250/CMakeLists.txt → ...r/COMPONENT_ALTAIR_ALT1250/CMakeLists.txt b/...rs/cellular/Altair/ALT1250/CMakeLists.txt → ...r/COMPONENT_ALTAIR_ALT1250/CMakeLists.txt
diff --git a/...llular/Altair/ALT1250/PPP/ALT1250_PPP.cpp → ...PONENT_ALTAIR_ALT1250/PPP/ALT1250_PPP.cpp b/...llular/Altair/ALT1250/PPP/ALT1250_PPP.cpp → ...PONENT_ALTAIR_ALT1250/PPP/ALT1250_PPP.cpp
diff --git a/...cellular/Altair/ALT1250/PPP/ALT1250_PPP.h → ...OMPONENT_ALTAIR_ALT1250/PPP/ALT1250_PPP.h b/...cellular/Altair/ALT1250/PPP/ALT1250_PPP.h → ...OMPONENT_ALTAIR_ALT1250/PPP/ALT1250_PPP.h
diff --git a/...T1250/PPP/ALT1250_PPP_CellularContext.cpp → ...T1250/PPP/ALT1250_PPP_CellularContext.cpp b/...T1250/PPP/ALT1250_PPP_CellularContext.cpp → ...T1250/PPP/ALT1250_PPP_CellularContext.cpp
diff --git a/...ALT1250/PPP/ALT1250_PPP_CellularContext.h → ...ALT1250/PPP/ALT1250_PPP_CellularContext.h b/...ALT1250/PPP/ALT1250_PPP_CellularContext.h → ...ALT1250/PPP/ALT1250_PPP_CellularContext.h
diff --git a/...T1250/PPP/ALT1250_PPP_CellularNetwork.cpp → ...T1250/PPP/ALT1250_PPP_CellularNetwork.cpp b/...T1250/PPP/ALT1250_PPP_CellularNetwork.cpp → ...T1250/PPP/ALT1250_PPP_CellularNetwork.cpp
diff --git a/...ALT1250/PPP/ALT1250_PPP_CellularNetwork.h → ...ALT1250/PPP/ALT1250_PPP_CellularNetwork.h b/...ALT1250/PPP/ALT1250_PPP_CellularNetwork.h → ...ALT1250/PPP/ALT1250_PPP_CellularNetwork.h
diff --git a/...ellular/Altair/ALT1250/PPP/CMakeLists.txt → ...MPONENT_ALTAIR_ALT1250/PPP/CMakeLists.txt b/...ellular/Altair/ALT1250/PPP/CMakeLists.txt → ...MPONENT_ALTAIR_ALT1250/PPP/CMakeLists.txt
diff --git a/...cellular/Altair/ALT1250/PPP/mbed_lib.json → ...OMPONENT_ALTAIR_ALT1250/PPP/mbed_lib.json b/...cellular/Altair/ALT1250/PPP/mbed_lib.json → ...OMPONENT_ALTAIR_ALT1250/PPP/mbed_lib.json
diff --git a/connectivity/drivers/cellular/CMakeLists.txt b/connectivity/drivers/cellular/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("STMOD_CELLULAR" IN_LIST MBED_TARGET_LABELS)
+if("COMPONENT_STMOD_CELLULAR=1" IN_LIST MBED_TARGET_DEFINITIONS)
     add_subdirectory(COMPONENT_STMOD_CELLULAR)
 endif()
 
@@ -11,10 +11,4 @@ add_subdirectory(GENERIC)
 add_subdirectory(MultiTech)
 add_subdirectory(QUECTEL)
 add_subdirectory(RiotMicro)
-add_subdirectory(TELIT)
-add_subdirectory(UBLOX)
-
-target_include_directories(mbed-cellular
-    PUBLIC
-        .
-)
+add_subdirectory(TELIT)
diff --git a/connectivity/drivers/cellular/GEMALTO/CMakeLists.txt b/connectivity/drivers/cellular/GEMALTO/CMakeLists.txt
@@ -1,4 +1,6 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(CINTERION)
+if("COMPONENT_GEMALTO_CINTERION=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(CINTERION)
+endif()
diff --git a/...cellular/GEMALTO/CINTERION/CMakeLists.txt → ...OMPONENT_GEMALTO_CINTERION/CMakeLists.txt b/...cellular/GEMALTO/CINTERION/CMakeLists.txt → ...OMPONENT_GEMALTO_CINTERION/CMakeLists.txt
diff --git a/...r/GEMALTO/CINTERION/GEMALTO_CINTERION.cpp → ...T_GEMALTO_CINTERION/GEMALTO_CINTERION.cpp b/...r/GEMALTO/CINTERION/GEMALTO_CINTERION.cpp → ...T_GEMALTO_CINTERION/GEMALTO_CINTERION.cpp
diff --git a/...lar/GEMALTO/CINTERION/GEMALTO_CINTERION.h → ...ENT_GEMALTO_CINTERION/GEMALTO_CINTERION.h b/...lar/GEMALTO/CINTERION/GEMALTO_CINTERION.h → ...ENT_GEMALTO_CINTERION/GEMALTO_CINTERION.h
diff --git a/...ION/GEMALTO_CINTERION_CellularContext.cpp → ...ION/GEMALTO_CINTERION_CellularContext.cpp b/...ION/GEMALTO_CINTERION_CellularContext.cpp → ...ION/GEMALTO_CINTERION_CellularContext.cpp
diff --git a/...ERION/GEMALTO_CINTERION_CellularContext.h → ...ERION/GEMALTO_CINTERION_CellularContext.h b/...ERION/GEMALTO_CINTERION_CellularContext.h → ...ERION/GEMALTO_CINTERION_CellularContext.h
diff --git a/...GEMALTO_CINTERION_CellularInformation.cpp → ...GEMALTO_CINTERION_CellularInformation.cpp b/...GEMALTO_CINTERION_CellularInformation.cpp → ...GEMALTO_CINTERION_CellularInformation.cpp
diff --git a/...N/GEMALTO_CINTERION_CellularInformation.h → ...N/GEMALTO_CINTERION_CellularInformation.h b/...N/GEMALTO_CINTERION_CellularInformation.h → ...N/GEMALTO_CINTERION_CellularInformation.h
diff --git a/...ERION/GEMALTO_CINTERION_CellularStack.cpp → ...ERION/GEMALTO_CINTERION_CellularStack.cpp b/...ERION/GEMALTO_CINTERION_CellularStack.cpp → ...ERION/GEMALTO_CINTERION_CellularStack.cpp
diff --git a/...NTERION/GEMALTO_CINTERION_CellularStack.h → ...NTERION/GEMALTO_CINTERION_CellularStack.h b/...NTERION/GEMALTO_CINTERION_CellularStack.h → ...NTERION/GEMALTO_CINTERION_CellularStack.h
diff --git a/.../cellular/GEMALTO/CINTERION/mbed_lib.json → ...COMPONENT_GEMALTO_CINTERION/mbed_lib.json b/.../cellular/GEMALTO/CINTERION/mbed_lib.json → ...COMPONENT_GEMALTO_CINTERION/mbed_lib.json
diff --git a/connectivity/drivers/cellular/GENERIC/CMakeLists.txt b/connectivity/drivers/cellular/GENERIC/CMakeLists.txt
@@ -1,4 +1,6 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(GENERIC_AT3GPP)
+if("COMPONENT_GENERIC_AT3GPP=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(COMPONENT_GENERIC_AT3GPP)
+endif()
diff --git a/...lar/GENERIC/GENERIC_AT3GPP/CMakeLists.txt → ...C/COMPONENT_GENERIC_AT3GPP/CMakeLists.txt b/...lar/GENERIC/GENERIC_AT3GPP/CMakeLists.txt → ...C/COMPONENT_GENERIC_AT3GPP/CMakeLists.txt
diff --git a/...GENERIC/GENERIC_AT3GPP/GENERIC_AT3GPP.cpp → ...MPONENT_GENERIC_AT3GPP/GENERIC_AT3GPP.cpp b/...GENERIC/GENERIC_AT3GPP/GENERIC_AT3GPP.cpp → ...MPONENT_GENERIC_AT3GPP/GENERIC_AT3GPP.cpp
diff --git a/...r/GENERIC/GENERIC_AT3GPP/GENERIC_AT3GPP.h → ...COMPONENT_GENERIC_AT3GPP/GENERIC_AT3GPP.h b/...r/GENERIC/GENERIC_AT3GPP/GENERIC_AT3GPP.h → ...COMPONENT_GENERIC_AT3GPP/GENERIC_AT3GPP.h
diff --git a/...ular/GENERIC/GENERIC_AT3GPP/mbed_lib.json → ...IC/COMPONENT_GENERIC_AT3GPP/mbed_lib.json b/...ular/GENERIC/GENERIC_AT3GPP/mbed_lib.json → ...IC/COMPONENT_GENERIC_AT3GPP/mbed_lib.json
diff --git a/connectivity/drivers/cellular/MultiTech/CMakeLists.txt b/connectivity/drivers/cellular/MultiTech/CMakeLists.txt
@@ -1,4 +1,6 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(DragonflyNano)
+if("COMPONENT_MULTITECH_DRAGONFLY_NANO_CELLULAR=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(COMPONENT_MULTITECH_DRAGONFLY_NANO_CELLULAR)
+endif()
diff --git a/...ultiTech/DragonflyNano/PPP/CMakeLists.txt → ...CH_DRAGONFLY_NANO_CELLULAR/CMakeLists.txt b/...ultiTech/DragonflyNano/PPP/CMakeLists.txt → ...CH_DRAGONFLY_NANO_CELLULAR/CMakeLists.txt
@@ -11,3 +11,7 @@ target_sources(mbed-cellular
         SARA4_PPP.cpp
         SARA4_PPP_CellularNetwork.cpp
 )
+
+if("MTS_DRAGONFLY_L471QG" IN_LIST MBED_TARGET_LABELS)
+	add_subdirectory(TARGET_MTS_DRAGONFLY_L471QG)
+endif()
diff --git a/...MultiTech/DragonflyNano/PPP/SARA4_PPP.cpp → ...ECH_DRAGONFLY_NANO_CELLULAR/SARA4_PPP.cpp b/...MultiTech/DragonflyNano/PPP/SARA4_PPP.cpp → ...ECH_DRAGONFLY_NANO_CELLULAR/SARA4_PPP.cpp
diff --git a/...r/MultiTech/DragonflyNano/PPP/SARA4_PPP.h → ...ITECH_DRAGONFLY_NANO_CELLULAR/SARA4_PPP.h b/...r/MultiTech/DragonflyNano/PPP/SARA4_PPP.h → ...ITECH_DRAGONFLY_NANO_CELLULAR/SARA4_PPP.h
diff --git a/...flyNano/PPP/SARA4_PPP_CellularNetwork.cpp → ...NO_CELLULAR/SARA4_PPP_CellularNetwork.cpp b/...flyNano/PPP/SARA4_PPP_CellularNetwork.cpp → ...NO_CELLULAR/SARA4_PPP_CellularNetwork.cpp
diff --git a/...onflyNano/PPP/SARA4_PPP_CellularNetwork.h → ...NANO_CELLULAR/SARA4_PPP_CellularNetwork.h b/...onflyNano/PPP/SARA4_PPP_CellularNetwork.h → ...NANO_CELLULAR/SARA4_PPP_CellularNetwork.h
diff --git a/...ivers/cellular/TELIT/HE910/CMakeLists.txt → ...ARGET_MTS_DRAGONFLY_L471QG/CMakeLists.txt b/...ivers/cellular/TELIT/HE910/CMakeLists.txt → ...ARGET_MTS_DRAGONFLY_L471QG/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2024 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-cellular
@@ -8,5 +8,5 @@ target_include_directories(mbed-cellular
 
 target_sources(mbed-cellular
     PRIVATE
-        TELIT_HE910.cpp
-)
+        ONBOARD_SARA4_PPP.cpp
+)
diff --git a/...TS_DRAGONFLY_L471QG/ONBOARD_SARA4_PPP.cpp → ...TS_DRAGONFLY_L471QG/ONBOARD_SARA4_PPP.cpp b/...TS_DRAGONFLY_L471QG/ONBOARD_SARA4_PPP.cpp → ...TS_DRAGONFLY_L471QG/ONBOARD_SARA4_PPP.cpp
@@ -111,7 +111,7 @@ void ONBOARD_SARA4_PPP::onboard_modem_deinit()
 void ONBOARD_SARA4_PPP::onboard_modem_power_up()
 {
     // Make sure the radio is initialized so it can be powered on.
-    if (!initialized){
+    if (!initialized) {
         onboard_modem_init();
     }
 
@@ -129,7 +129,7 @@ void ONBOARD_SARA4_PPP::onboard_modem_power_up()
     uint8_t retries = 5;
     do {
         // If it hasn't turned on after multiple tries, exit and return.
-        if(0 == retries--) {
+        if (0 == retries--) {
             return;
         }
         // Activate PWR_ON for 150ms-3.2s to switch on. Reference ublox SARA-R4 data sheet.
@@ -153,7 +153,7 @@ void ONBOARD_SARA4_PPP::onboard_modem_power_down()
     }
 
     // Make sure the I/O are properly initialized.
-    if (!initialized){
+    if (!initialized) {
         onboard_modem_init();
     }
     // Activate PWR_ON for at least 1.5s to switch off. Reference ublox SARA-R4 data sheet.

diff --git a/..._MTS_DRAGONFLY_L471QG/ONBOARD_SARA4_PPP.h → ..._MTS_DRAGONFLY_L471QG/ONBOARD_SARA4_PPP.h b/..._MTS_DRAGONFLY_L471QG/ONBOARD_SARA4_PPP.h → ..._MTS_DRAGONFLY_L471QG/ONBOARD_SARA4_PPP.h
diff --git a/...MultiTech/DragonflyNano/PPP/mbed_lib.json → ...ECH_DRAGONFLY_NANO_CELLULAR/mbed_lib.json b/...MultiTech/DragonflyNano/PPP/mbed_lib.json → ...ECH_DRAGONFLY_NANO_CELLULAR/mbed_lib.json
diff --git a/connectivity/drivers/cellular/QUECTEL/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/CMakeLists.txt
@@ -1,8 +1,23 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(BC95)
-add_subdirectory(BG96)
-add_subdirectory(EC2X)
-add_subdirectory(M26)
-add_subdirectory(UG96)
+if("COMPONENT_QUECTEL_EC2X=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(COMPONENT_QUECTEL_EC2X)
+endif()
+
+if("COMPONENT_QUECTEL_BG96=1" IN_LIST MBED_TARGET_DEFINITIONS OR ("COMPONENT_STMOD_CELLULAR=1" IN_LIST MBED_TARGET_DEFINITIONS AND "MBED_CONF_STMOD_CELLULAR_TYPE=STMOD_BG96"))
+	add_subdirectory(COMPONENT_QUECTEL_BG96)
+endif()
+
+if("COMPONENT_QUECTEL_UG96=1" IN_LIST MBED_TARGET_DEFINITIONS OR ("COMPONENT_STMOD_CELLULAR=1" IN_LIST MBED_TARGET_DEFINITIONS AND "MBED_CONF_STMOD_CELLULAR_TYPE=STMOD_UG96"))
+	add_subdirectory(COMPONENT_QUECTEL_UG96)
+endif()
+
+if("COMPONENT_QUECTEL_BC95=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(COMPONENT_QUECTEL_BC95)
+endif()
+
+if("COMPONENT_QUECTEL_M26=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(COMPONENT_QUECTEL_M26)
+endif()
+
diff --git a/...vers/cellular/QUECTEL/BC95/CMakeLists.txt → ...TEL/COMPONENT_QUECTEL_BC95/CMakeLists.txt b/...vers/cellular/QUECTEL/BC95/CMakeLists.txt → ...TEL/COMPONENT_QUECTEL_BC95/CMakeLists.txt
@@ -14,3 +14,7 @@ target_sources(mbed-cellular
         QUECTEL_BC95_CellularNetwork.cpp
         QUECTEL_BC95_CellularStack.cpp
 )
+
+if("TARGET_ADV_WISE_1570" IN_LIST MBED_TARGET_LABELS)
+	add_subdirectory(TARGET_ADV_WISE_1570)
+endif()
diff --git a/...rs/cellular/QUECTEL/BC95/QUECTEL_BC95.cpp → ...L/COMPONENT_QUECTEL_BC95/QUECTEL_BC95.cpp b/...rs/cellular/QUECTEL/BC95/QUECTEL_BC95.cpp → ...L/COMPONENT_QUECTEL_BC95/QUECTEL_BC95.cpp
diff --git a/...vers/cellular/QUECTEL/BC95/QUECTEL_BC95.h → ...TEL/COMPONENT_QUECTEL_BC95/QUECTEL_BC95.h b/...vers/cellular/QUECTEL/BC95/QUECTEL_BC95.h → ...TEL/COMPONENT_QUECTEL_BC95/QUECTEL_BC95.h
diff --git a/...TEL/BC95/QUECTEL_BC95_CellularContext.cpp → ...TEL_BC95/QUECTEL_BC95_CellularContext.cpp b/...TEL/BC95/QUECTEL_BC95_CellularContext.cpp → ...TEL_BC95/QUECTEL_BC95_CellularContext.cpp
diff --git a/...ECTEL/BC95/QUECTEL_BC95_CellularContext.h → ...ECTEL_BC95/QUECTEL_BC95_CellularContext.h b/...ECTEL/BC95/QUECTEL_BC95_CellularContext.h → ...ECTEL_BC95/QUECTEL_BC95_CellularContext.h
diff --git a/...BC95/QUECTEL_BC95_CellularInformation.cpp → ...BC95/QUECTEL_BC95_CellularInformation.cpp b/...BC95/QUECTEL_BC95_CellularInformation.cpp → ...BC95/QUECTEL_BC95_CellularInformation.cpp
diff --git a/...L/BC95/QUECTEL_BC95_CellularInformation.h → ...L_BC95/QUECTEL_BC95_CellularInformation.h b/...L/BC95/QUECTEL_BC95_CellularInformation.h → ...L_BC95/QUECTEL_BC95_CellularInformation.h
diff --git a/...TEL/BC95/QUECTEL_BC95_CellularNetwork.cpp → ...TEL_BC95/QUECTEL_BC95_CellularNetwork.cpp b/...TEL/BC95/QUECTEL_BC95_CellularNetwork.cpp → ...TEL_BC95/QUECTEL_BC95_CellularNetwork.cpp
diff --git a/...ECTEL/BC95/QUECTEL_BC95_CellularNetwork.h → ...ECTEL_BC95/QUECTEL_BC95_CellularNetwork.h b/...ECTEL/BC95/QUECTEL_BC95_CellularNetwork.h → ...ECTEL_BC95/QUECTEL_BC95_CellularNetwork.h
diff --git a/...ECTEL/BC95/QUECTEL_BC95_CellularStack.cpp → ...ECTEL_BC95/QUECTEL_BC95_CellularStack.cpp b/...ECTEL/BC95/QUECTEL_BC95_CellularStack.cpp → ...ECTEL_BC95/QUECTEL_BC95_CellularStack.cpp
diff --git a/...QUECTEL/BC95/QUECTEL_BC95_CellularStack.h → ...QUECTEL_BC95/QUECTEL_BC95_CellularStack.h b/...QUECTEL/BC95/QUECTEL_BC95_CellularStack.h → ...QUECTEL_BC95/QUECTEL_BC95_CellularStack.h
diff --git a/...ivity/drivers/cellular/QUECTEL/COMPONENT_QUECTEL_BC95/TARGET_ADV_WISE_1570/CMakeLists.txt b/...ivity/drivers/cellular/QUECTEL/COMPONENT_QUECTEL_BC95/TARGET_ADV_WISE_1570/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-cellular
+    PUBLIC
+        .
+)
+
+target_sources(mbed-cellular
+    PRIVATE
+        ONBOARD_QUECTEL_BC95.cpp
+)
diff --git a/...ET_ADV_WISE_1570/ONBOARD_QUECTEL_BC95.cpp → ...ET_ADV_WISE_1570/ONBOARD_QUECTEL_BC95.cpp b/...ET_ADV_WISE_1570/ONBOARD_QUECTEL_BC95.cpp → ...ET_ADV_WISE_1570/ONBOARD_QUECTEL_BC95.cpp
diff --git a/...RGET_ADV_WISE_1570/ONBOARD_QUECTEL_BC95.h → ...RGET_ADV_WISE_1570/ONBOARD_QUECTEL_BC95.h b/...RGET_ADV_WISE_1570/ONBOARD_QUECTEL_BC95.h → ...RGET_ADV_WISE_1570/ONBOARD_QUECTEL_BC95.h
diff --git a/...ivers/cellular/QUECTEL/BC95/mbed_lib.json → ...CTEL/COMPONENT_QUECTEL_BC95/mbed_lib.json b/...ivers/cellular/QUECTEL/BC95/mbed_lib.json → ...CTEL/COMPONENT_QUECTEL_BC95/mbed_lib.json
diff --git a/...vers/cellular/QUECTEL/BG96/CMakeLists.txt → ...TEL/COMPONENT_QUECTEL_BG96/CMakeLists.txt b/...vers/cellular/QUECTEL/BG96/CMakeLists.txt → ...TEL/COMPONENT_QUECTEL_BG96/CMakeLists.txt
@@ -15,3 +15,7 @@ target_sources(mbed-cellular
         QUECTEL_BG96_CellularStack.cpp
         QUECTEL_BG96_ControlPlane_netif.cpp
 )
+
+if("TARGET_WIO_BG96" IN_LIST MBED_TARGET_LABELS)
+	add_subdirectory(TARGET_WIO_BG96)
+endif()
diff --git a/...rs/cellular/QUECTEL/BG96/QUECTEL_BG96.cpp → ...L/COMPONENT_QUECTEL_BG96/QUECTEL_BG96.cpp b/...rs/cellular/QUECTEL/BG96/QUECTEL_BG96.cpp → ...L/COMPONENT_QUECTEL_BG96/QUECTEL_BG96.cpp
diff --git a/...vers/cellular/QUECTEL/BG96/QUECTEL_BG96.h → ...TEL/COMPONENT_QUECTEL_BG96/QUECTEL_BG96.h b/...vers/cellular/QUECTEL/BG96/QUECTEL_BG96.h → ...TEL/COMPONENT_QUECTEL_BG96/QUECTEL_BG96.h
diff --git a/...TEL/BG96/QUECTEL_BG96_CellularContext.cpp → ...TEL_BG96/QUECTEL_BG96_CellularContext.cpp b/...TEL/BG96/QUECTEL_BG96_CellularContext.cpp → ...TEL_BG96/QUECTEL_BG96_CellularContext.cpp
diff --git a/...ECTEL/BG96/QUECTEL_BG96_CellularContext.h → ...ECTEL_BG96/QUECTEL_BG96_CellularContext.h b/...ECTEL/BG96/QUECTEL_BG96_CellularContext.h → ...ECTEL_BG96/QUECTEL_BG96_CellularContext.h
diff --git a/...BG96/QUECTEL_BG96_CellularInformation.cpp → ...BG96/QUECTEL_BG96_CellularInformation.cpp b/...BG96/QUECTEL_BG96_CellularInformation.cpp → ...BG96/QUECTEL_BG96_CellularInformation.cpp
diff --git a/...L/BG96/QUECTEL_BG96_CellularInformation.h → ...L_BG96/QUECTEL_BG96_CellularInformation.h b/...L/BG96/QUECTEL_BG96_CellularInformation.h → ...L_BG96/QUECTEL_BG96_CellularInformation.h
diff --git a/...TEL/BG96/QUECTEL_BG96_CellularNetwork.cpp → ...TEL_BG96/QUECTEL_BG96_CellularNetwork.cpp b/...TEL/BG96/QUECTEL_BG96_CellularNetwork.cpp → ...TEL_BG96/QUECTEL_BG96_CellularNetwork.cpp
diff --git a/...ECTEL/BG96/QUECTEL_BG96_CellularNetwork.h → ...ECTEL_BG96/QUECTEL_BG96_CellularNetwork.h b/...ECTEL/BG96/QUECTEL_BG96_CellularNetwork.h → ...ECTEL_BG96/QUECTEL_BG96_CellularNetwork.h
diff --git a/...ECTEL/BG96/QUECTEL_BG96_CellularStack.cpp → ...ECTEL_BG96/QUECTEL_BG96_CellularStack.cpp b/...ECTEL/BG96/QUECTEL_BG96_CellularStack.cpp → ...ECTEL_BG96/QUECTEL_BG96_CellularStack.cpp
diff --git a/...QUECTEL/BG96/QUECTEL_BG96_CellularStack.h → ...QUECTEL_BG96/QUECTEL_BG96_CellularStack.h b/...QUECTEL/BG96/QUECTEL_BG96_CellularStack.h → ...QUECTEL_BG96/QUECTEL_BG96_CellularStack.h
diff --git a/.../BG96/QUECTEL_BG96_ControlPlane_netif.cpp → ..._BG96/QUECTEL_BG96_ControlPlane_netif.cpp b/.../BG96/QUECTEL_BG96_ControlPlane_netif.cpp → ..._BG96/QUECTEL_BG96_ControlPlane_netif.cpp
diff --git a/...EL/BG96/QUECTEL_BG96_ControlPlane_netif.h → ...EL_BG96/QUECTEL_BG96_ControlPlane_netif.h b/...EL/BG96/QUECTEL_BG96_ControlPlane_netif.h → ...EL_BG96/QUECTEL_BG96_ControlPlane_netif.h
diff --git a/connectivity/drivers/cellular/QUECTEL/COMPONENT_QUECTEL_BG96/TARGET_WIO_BG96/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/COMPONENT_QUECTEL_BG96/TARGET_WIO_BG96/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-cellular
+    PUBLIC
+        .
+)
+
+target_sources(mbed-cellular
+    PRIVATE
+        ONBOARD_QUECTEL_BG96.cpp
+)
diff --git a/.../TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.cpp → .../TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.cpp b/.../TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.cpp → .../TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.cpp
diff --git a/...xI/TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.h → ...96/TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.h b/...xI/TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.h → ...96/TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.h
diff --git a/...ivers/cellular/QUECTEL/BG96/mbed_lib.json → ...CTEL/COMPONENT_QUECTEL_BG96/mbed_lib.json b/...ivers/cellular/QUECTEL/BG96/mbed_lib.json → ...CTEL/COMPONENT_QUECTEL_BG96/mbed_lib.json
diff --git a/...vers/cellular/QUECTEL/EC2X/CMakeLists.txt → ...TEL/COMPONENT_QUECTEL_EC2X/CMakeLists.txt b/...vers/cellular/QUECTEL/EC2X/CMakeLists.txt → ...TEL/COMPONENT_QUECTEL_EC2X/CMakeLists.txt
@@ -10,3 +10,7 @@ target_sources(mbed-cellular
     PRIVATE
         QUECTEL_EC2X.cpp
 )
+
+if("MTS_DRAGONFLY_L496VG" IN_LIST MBED_TARGET_LABELS)
+	add_subdirectory(TARGET_MTS_DRAGONFLY_L496VG)
+endif()
diff --git a/...rs/cellular/QUECTEL/EC2X/QUECTEL_EC2X.cpp → ...L/COMPONENT_QUECTEL_EC2X/QUECTEL_EC2X.cpp b/...rs/cellular/QUECTEL/EC2X/QUECTEL_EC2X.cpp → ...L/COMPONENT_QUECTEL_EC2X/QUECTEL_EC2X.cpp
diff --git a/...vers/cellular/QUECTEL/EC2X/QUECTEL_EC2X.h → ...TEL/COMPONENT_QUECTEL_EC2X/QUECTEL_EC2X.h b/...vers/cellular/QUECTEL/EC2X/QUECTEL_EC2X.h → ...TEL/COMPONENT_QUECTEL_EC2X/QUECTEL_EC2X.h
diff --git a/...rivers/cellular/QUECTEL/COMPONENT_QUECTEL_EC2X/TARGET_MTS_DRAGONFLY_L496VG/CMakeLists.txt b/...rivers/cellular/QUECTEL/COMPONENT_QUECTEL_EC2X/TARGET_MTS_DRAGONFLY_L496VG/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-cellular
+    PUBLIC
+        .
+)
+
+target_sources(mbed-cellular
+    PRIVATE
+        ONBOARD_QUECTEL_EG25.cpp
+)
diff --git a/...DRAGONFLY_L496VG/ONBOARD_QUECTEL_EG25.cpp → ...DRAGONFLY_L496VG/ONBOARD_QUECTEL_EG25.cpp b/...DRAGONFLY_L496VG/ONBOARD_QUECTEL_EG25.cpp → ...DRAGONFLY_L496VG/ONBOARD_QUECTEL_EG25.cpp
@@ -127,11 +127,11 @@ void ONBOARD_QUECTEL_EG25::onboard_modem_power_up()
 {
     // NET_STATUS = input. InterruptIn make LS LED follow.
     // LS_LED = output. Follow NET_STATUS.
-    net_status->rise(callback(this,&ONBOARD_QUECTEL_EG25::link_status));
-    net_status->fall(callback(this,&ONBOARD_QUECTEL_EG25::link_status));
+    net_status->rise(callback(this, &ONBOARD_QUECTEL_EG25::link_status));
+    net_status->fall(callback(this, &ONBOARD_QUECTEL_EG25::link_status));
 
     // Make sure the radio is initialized so it can be powered on.
-    if (!initialized){
+    if (!initialized) {
         onboard_modem_init();
     }
 
@@ -152,7 +152,7 @@ void ONBOARD_QUECTEL_EG25::onboard_modem_power_up()
     do {
         thread_sleep_for(1000);
         radio_off = gpio_read(&status);
-        if(!timeout--){
+        if (!timeout--) {
             press_power_button(550000);
             timeout = 10;
         }
@@ -186,7 +186,7 @@ void ONBOARD_QUECTEL_EG25::onboard_modem_power_down()
     }
 
     // Make sure the I/O are properly initialized.
-    if (!initialized){
+    if (!initialized) {
         onboard_modem_init();
     }
 
@@ -202,12 +202,10 @@ void ONBOARD_QUECTEL_EG25::onboard_modem_power_down()
 
         if (radio_off) {
             break;
-        }
-        else {
+        } else {
             onboard_modem_reset();
         }
-    }
-    while (!radio_off);
+    } while (!radio_off);
 }
 
 void ONBOARD_QUECTEL_EG25::onboard_modem_reset()

diff --git a/...S_DRAGONFLY_L496VG/ONBOARD_QUECTEL_EG25.h → ...S_DRAGONFLY_L496VG/ONBOARD_QUECTEL_EG25.h b/...S_DRAGONFLY_L496VG/ONBOARD_QUECTEL_EG25.h → ...S_DRAGONFLY_L496VG/ONBOARD_QUECTEL_EG25.h
@@ -33,8 +33,8 @@ class ONBOARD_QUECTEL_EG25 : public QUECTEL_EC2X {
 
 private:
     uint8_t initialized;
-    DigitalOut* ls;
-    InterruptIn* net_status;
+    DigitalOut *ls;
+    InterruptIn *net_status;
     void link_status();
     void press_power_button(int time_ms);
     void onboard_modem_init();

diff --git a/...ivers/cellular/QUECTEL/EC2X/mbed_lib.json → ...CTEL/COMPONENT_QUECTEL_EC2X/mbed_lib.json b/...ivers/cellular/QUECTEL/EC2X/mbed_lib.json → ...CTEL/COMPONENT_QUECTEL_EC2X/mbed_lib.json
diff --git a/...ivers/cellular/QUECTEL/M26/CMakeLists.txt → ...CTEL/COMPONENT_QUECTEL_M26/CMakeLists.txt b/...ivers/cellular/QUECTEL/M26/CMakeLists.txt → ...CTEL/COMPONENT_QUECTEL_M26/CMakeLists.txt
diff --git a/...vers/cellular/QUECTEL/M26/QUECTEL_M26.cpp → ...TEL/COMPONENT_QUECTEL_M26/QUECTEL_M26.cpp b/...vers/cellular/QUECTEL/M26/QUECTEL_M26.cpp → ...TEL/COMPONENT_QUECTEL_M26/QUECTEL_M26.cpp
diff --git a/...rivers/cellular/QUECTEL/M26/QUECTEL_M26.h → ...ECTEL/COMPONENT_QUECTEL_M26/QUECTEL_M26.h b/...rivers/cellular/QUECTEL/M26/QUECTEL_M26.h → ...ECTEL/COMPONENT_QUECTEL_M26/QUECTEL_M26.h
diff --git a/...ECTEL/M26/QUECTEL_M26_CellularContext.cpp → ...ECTEL_M26/QUECTEL_M26_CellularContext.cpp b/...ECTEL/M26/QUECTEL_M26_CellularContext.cpp → ...ECTEL_M26/QUECTEL_M26_CellularContext.cpp
diff --git a/...QUECTEL/M26/QUECTEL_M26_CellularContext.h → ...QUECTEL_M26/QUECTEL_M26_CellularContext.h b/...QUECTEL/M26/QUECTEL_M26_CellularContext.h → ...QUECTEL_M26/QUECTEL_M26_CellularContext.h
diff --git a/...L/M26/QUECTEL_M26_CellularInformation.cpp → ...L_M26/QUECTEL_M26_CellularInformation.cpp b/...L/M26/QUECTEL_M26_CellularInformation.cpp → ...L_M26/QUECTEL_M26_CellularInformation.cpp
diff --git a/...TEL/M26/QUECTEL_M26_CellularInformation.h → ...TEL_M26/QUECTEL_M26_CellularInformation.h b/...TEL/M26/QUECTEL_M26_CellularInformation.h → ...TEL_M26/QUECTEL_M26_CellularInformation.h
diff --git a/...QUECTEL/M26/QUECTEL_M26_CellularStack.cpp → ...QUECTEL_M26/QUECTEL_M26_CellularStack.cpp b/...QUECTEL/M26/QUECTEL_M26_CellularStack.cpp → ...QUECTEL_M26/QUECTEL_M26_CellularStack.cpp
diff --git a/...r/QUECTEL/M26/QUECTEL_M26_CellularStack.h → ...T_QUECTEL_M26/QUECTEL_M26_CellularStack.h b/...r/QUECTEL/M26/QUECTEL_M26_CellularStack.h → ...T_QUECTEL_M26/QUECTEL_M26_CellularStack.h
diff --git a/...rivers/cellular/QUECTEL/M26/mbed_lib.json → ...ECTEL/COMPONENT_QUECTEL_M26/mbed_lib.json b/...rivers/cellular/QUECTEL/M26/mbed_lib.json → ...ECTEL/COMPONENT_QUECTEL_M26/mbed_lib.json
diff --git a/...vers/cellular/QUECTEL/UG96/CMakeLists.txt → ...TEL/COMPONENT_QUECTEL_UG96/CMakeLists.txt b/...vers/cellular/QUECTEL/UG96/CMakeLists.txt → ...TEL/COMPONENT_QUECTEL_UG96/CMakeLists.txt
@@ -11,3 +11,7 @@ target_sources(mbed-cellular
         QUECTEL_UG96.cpp
         QUECTEL_UG96_CellularContext.cpp
 )
+
+if("TARGET_WIO_3G" IN_LIST MBED_TARGET_LABELS)
+	add_subdirectory(TARGET_WIO_3G)
+endif()
diff --git a/...rs/cellular/QUECTEL/UG96/QUECTEL_UG96.cpp → ...L/COMPONENT_QUECTEL_UG96/QUECTEL_UG96.cpp b/...rs/cellular/QUECTEL/UG96/QUECTEL_UG96.cpp → ...L/COMPONENT_QUECTEL_UG96/QUECTEL_UG96.cpp
diff --git a/...vers/cellular/QUECTEL/UG96/QUECTEL_UG96.h → ...TEL/COMPONENT_QUECTEL_UG96/QUECTEL_UG96.h b/...vers/cellular/QUECTEL/UG96/QUECTEL_UG96.h → ...TEL/COMPONENT_QUECTEL_UG96/QUECTEL_UG96.h
diff --git a/...TEL/UG96/QUECTEL_UG96_CellularContext.cpp → ...TEL_UG96/QUECTEL_UG96_CellularContext.cpp b/...TEL/UG96/QUECTEL_UG96_CellularContext.cpp → ...TEL_UG96/QUECTEL_UG96_CellularContext.cpp
diff --git a/...ECTEL/UG96/QUECTEL_UG96_CellularContext.h → ...ECTEL_UG96/QUECTEL_UG96_CellularContext.h b/...ECTEL/UG96/QUECTEL_UG96_CellularContext.h → ...ECTEL_UG96/QUECTEL_UG96_CellularContext.h
diff --git a/connectivity/drivers/cellular/QUECTEL/COMPONENT_QUECTEL_UG96/TARGET_WIO_3G/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/COMPONENT_QUECTEL_UG96/TARGET_WIO_3G/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-cellular
+    PUBLIC
+        .
+)
+
+target_sources(mbed-cellular
+    PRIVATE
+        ONBOARD_QUECTEL_UG96.cpp
+)
diff --git a/...xI/TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.cpp → ...96/TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.cpp b/...xI/TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.cpp → ...96/TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.cpp
diff --git a/...39xI/TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.h → ...UG96/TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.h b/...39xI/TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.h → ...UG96/TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.h
diff --git a/...ivers/cellular/QUECTEL/UG96/mbed_lib.json → ...CTEL/COMPONENT_QUECTEL_UG96/mbed_lib.json b/...ivers/cellular/QUECTEL/UG96/mbed_lib.json → ...CTEL/COMPONENT_QUECTEL_UG96/mbed_lib.json
diff --git a/connectivity/drivers/cellular/RiotMicro/CMakeLists.txt b/connectivity/drivers/cellular/RiotMicro/CMakeLists.txt
@@ -1,4 +1,8 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(AT)
+# Note that the RM1000 chip appears to be unbuyable and the RIOT_MICRO_MODULE target that used it was
+# already removed from Mbed in Mbed 6.0.0.  This would make it a candidate for removal.
+if("COMPONENT_RIOTMICRO_RM1000=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(COMPONENT_RIOTMICRO_RM1000)
+endif()
diff --git a/...vers/cellular/RiotMicro/AT/CMakeLists.txt → ...COMPONENT_RIOTMICRO_RM1000/CMakeLists.txt b/...vers/cellular/RiotMicro/AT/CMakeLists.txt → ...COMPONENT_RIOTMICRO_RM1000/CMakeLists.txt
diff --git a/...ivers/cellular/RiotMicro/AT/RM1000_AT.cpp → .../COMPONENT_RIOTMICRO_RM1000/RM1000_AT.cpp b/...ivers/cellular/RiotMicro/AT/RM1000_AT.cpp → .../COMPONENT_RIOTMICRO_RM1000/RM1000_AT.cpp
diff --git a/...drivers/cellular/RiotMicro/AT/RM1000_AT.h → ...ro/COMPONENT_RIOTMICRO_RM1000/RM1000_AT.h b/...drivers/cellular/RiotMicro/AT/RM1000_AT.h → ...ro/COMPONENT_RIOTMICRO_RM1000/RM1000_AT.h
diff --git a/...iotMicro/AT/RM1000_AT_CellularContext.cpp → ...ICRO_RM1000/RM1000_AT_CellularContext.cpp b/...iotMicro/AT/RM1000_AT_CellularContext.cpp → ...ICRO_RM1000/RM1000_AT_CellularContext.cpp
diff --git a/.../RiotMicro/AT/RM1000_AT_CellularContext.h → ...TMICRO_RM1000/RM1000_AT_CellularContext.h b/.../RiotMicro/AT/RM1000_AT_CellularContext.h → ...TMICRO_RM1000/RM1000_AT_CellularContext.h
diff --git a/...iotMicro/AT/RM1000_AT_CellularNetwork.cpp → ...ICRO_RM1000/RM1000_AT_CellularNetwork.cpp b/...iotMicro/AT/RM1000_AT_CellularNetwork.cpp → ...ICRO_RM1000/RM1000_AT_CellularNetwork.cpp
diff --git a/.../RiotMicro/AT/RM1000_AT_CellularNetwork.h → ...TMICRO_RM1000/RM1000_AT_CellularNetwork.h b/.../RiotMicro/AT/RM1000_AT_CellularNetwork.h → ...TMICRO_RM1000/RM1000_AT_CellularNetwork.h
diff --git a/.../RiotMicro/AT/RM1000_AT_CellularStack.cpp → ...TMICRO_RM1000/RM1000_AT_CellularStack.cpp b/.../RiotMicro/AT/RM1000_AT_CellularStack.cpp → ...TMICRO_RM1000/RM1000_AT_CellularStack.cpp
diff --git a/...ar/RiotMicro/AT/RM1000_AT_CellularStack.h → ...IOTMICRO_RM1000/RM1000_AT_CellularStack.h b/...ar/RiotMicro/AT/RM1000_AT_CellularStack.h → ...IOTMICRO_RM1000/RM1000_AT_CellularStack.h
diff --git a/...ivers/cellular/RiotMicro/AT/mbed_lib.json → .../COMPONENT_RIOTMICRO_RM1000/mbed_lib.json b/...ivers/cellular/RiotMicro/AT/mbed_lib.json → .../COMPONENT_RIOTMICRO_RM1000/mbed_lib.json
diff --git a/connectivity/drivers/cellular/TELIT/CMakeLists.txt b/connectivity/drivers/cellular/TELIT/CMakeLists.txt
@@ -1,6 +1,14 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(HE910)
-add_subdirectory(ME310)
-add_subdirectory(ME910)
+if("COMPONENT_TELIT_HE910=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(COMPONENT_TELIT_HE910)
+endif()
+
+if("COMPONENT_TELIT_ME310=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(COMPONENT_TELIT_ME310)
+endif()
+
+if("COMPONENT_TELIT_ME910=1" IN_LIST MBED_TARGET_DEFINITIONS)
+	add_subdirectory(COMPONENT_TELIT_ME910)
+endif()
diff --git a/connectivity/drivers/cellular/TELIT/COMPONENT_TELIT_HE910/CMakeLists.txt b/connectivity/drivers/cellular/TELIT/COMPONENT_TELIT_HE910/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-cellular
+    PUBLIC
+        .
+)
+
+target_sources(mbed-cellular
+    PRIVATE
+        TELIT_HE910.cpp
+)
+
+if("TARGET_MTS_DRAGONFLY_F411RE" IN_LIST MBED_TARGET_LABELS)
+	add_subdirectory(TARGET_MTS_DRAGONFLY_F411RE)
+endif()
+
+if("TARGET_MTS_DRAGONFLY_F413RH" IN_LIST MBED_TARGET_LABELS)
+	add_subdirectory(TARGET_MTS_DRAGONFLY_F413RH)
+endif()