diff --git a/cmake/boards_db.cmake b/cmake/boards_db.cmake
index e09e54a069..17af4f861d 100644
--- a/cmake/boards_db.cmake
+++ b/cmake/boards_db.cmake
@@ -4169,7 +4169,7 @@ target_link_options(CoreBoard_F401RC_hid INTERFACE
 # DAISY_PATCH_SM
 # -----------------------------------------------------------------------------
 
-set(DAISY_PATCH_SM_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(DAISY_PATCH_SM_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
 set(DAISY_PATCH_SM_MAXSIZE 131072)
 set(DAISY_PATCH_SM_MAXDATASIZE 524288)
 set(DAISY_PATCH_SM_MCU cortex-m7)
@@ -4251,7 +4251,7 @@ target_compile_options(DAISY_PATCH_SM_xusb_HSFS INTERFACE
 # DAISY_PETAL_SM
 # -----------------------------------------------------------------------------
 
-set(DAISY_PETAL_SM_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(DAISY_PETAL_SM_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
 set(DAISY_PETAL_SM_MAXSIZE 131072)
 set(DAISY_PETAL_SM_MAXDATASIZE 524288)
 set(DAISY_PETAL_SM_MCU cortex-m7)
@@ -4333,7 +4333,7 @@ target_compile_options(DAISY_PETAL_SM_xusb_HSFS INTERFACE
 # DAISY_SEED
 # -----------------------------------------------------------------------------
 
-set(DAISY_SEED_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(DAISY_SEED_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
 set(DAISY_SEED_MAXSIZE 131072)
 set(DAISY_SEED_MAXDATASIZE 524288)
 set(DAISY_SEED_MCU cortex-m7)
@@ -73425,7 +73425,7 @@ target_compile_options(GENERIC_H733ZGTX_xusb_HSFS INTERFACE
 # GENERIC_H742IGKX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H742IGKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H742IGKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
 set(GENERIC_H742IGKX_MAXSIZE 1048576)
 set(GENERIC_H742IGKX_MAXDATASIZE 524288)
 set(GENERIC_H742IGKX_MCU cortex-m7)
@@ -73507,7 +73507,7 @@ target_compile_options(GENERIC_H742IGKX_xusb_HSFS INTERFACE
 # GENERIC_H742IGTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H742IGTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H742IGTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
 set(GENERIC_H742IGTX_MAXSIZE 1048576)
 set(GENERIC_H742IGTX_MAXDATASIZE 524288)
 set(GENERIC_H742IGTX_MCU cortex-m7)
@@ -73589,7 +73589,7 @@ target_compile_options(GENERIC_H742IGTX_xusb_HSFS INTERFACE
 # GENERIC_H742IIKX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H742IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H742IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
 set(GENERIC_H742IIKX_MAXSIZE 2097152)
 set(GENERIC_H742IIKX_MAXDATASIZE 524288)
 set(GENERIC_H742IIKX_MCU cortex-m7)
@@ -73671,7 +73671,7 @@ target_compile_options(GENERIC_H742IIKX_xusb_HSFS INTERFACE
 # GENERIC_H742IITX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H742IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H742IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
 set(GENERIC_H742IITX_MAXSIZE 2097152)
 set(GENERIC_H742IITX_MAXDATASIZE 524288)
 set(GENERIC_H742IITX_MCU cortex-m7)
@@ -74409,7 +74409,7 @@ target_compile_options(GENERIC_H742ZITX_xusb_HSFS INTERFACE
 # GENERIC_H743IGKX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H743IGKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H743IGKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
 set(GENERIC_H743IGKX_MAXSIZE 1048576)
 set(GENERIC_H743IGKX_MAXDATASIZE 524288)
 set(GENERIC_H743IGKX_MCU cortex-m7)
@@ -74491,7 +74491,7 @@ target_compile_options(GENERIC_H743IGKX_xusb_HSFS INTERFACE
 # GENERIC_H743IGTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H743IGTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H743IGTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
 set(GENERIC_H743IGTX_MAXSIZE 1048576)
 set(GENERIC_H743IGTX_MAXDATASIZE 524288)
 set(GENERIC_H743IGTX_MCU cortex-m7)
@@ -74573,7 +74573,7 @@ target_compile_options(GENERIC_H743IGTX_xusb_HSFS INTERFACE
 # GENERIC_H743IIKX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H743IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H743IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
 set(GENERIC_H743IIKX_MAXSIZE 2097152)
 set(GENERIC_H743IIKX_MAXDATASIZE 524288)
 set(GENERIC_H743IIKX_MCU cortex-m7)
@@ -74655,7 +74655,7 @@ target_compile_options(GENERIC_H743IIKX_xusb_HSFS INTERFACE
 # GENERIC_H743IITX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H743IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H743IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
 set(GENERIC_H743IITX_MAXSIZE 2097152)
 set(GENERIC_H743IITX_MAXDATASIZE 524288)
 set(GENERIC_H743IITX_MCU cortex-m7)
@@ -76049,7 +76049,7 @@ target_compile_options(GENERIC_H747XIHX_xusb_HSFS INTERFACE
 # GENERIC_H750IBKX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H750IBKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H750IBKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
 set(GENERIC_H750IBKX_MAXSIZE 131072)
 set(GENERIC_H750IBKX_MAXDATASIZE 524288)
 set(GENERIC_H750IBKX_MCU cortex-m7)
@@ -76131,7 +76131,7 @@ target_compile_options(GENERIC_H750IBKX_xusb_HSFS INTERFACE
 # GENERIC_H750IBTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H750IBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H750IBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
 set(GENERIC_H750IBTX_MAXSIZE 131072)
 set(GENERIC_H750IBTX_MAXDATASIZE 524288)
 set(GENERIC_H750IBTX_MCU cortex-m7)
@@ -76459,7 +76459,7 @@ target_compile_options(GENERIC_H750ZBTX_xusb_HSFS INTERFACE
 # GENERIC_H753IIKX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H753IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H753IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
 set(GENERIC_H753IIKX_MAXSIZE 2097152)
 set(GENERIC_H753IIKX_MAXDATASIZE 524288)
 set(GENERIC_H753IIKX_MCU cortex-m7)
@@ -76541,7 +76541,7 @@ target_compile_options(GENERIC_H753IIKX_xusb_HSFS INTERFACE
 # GENERIC_H753IITX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_H753IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
+set(GENERIC_H753IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
 set(GENERIC_H753IITX_MAXSIZE 2097152)
 set(GENERIC_H753IITX_MAXDATASIZE 524288)
 set(GENERIC_H753IITX_MCU cortex-m7)
diff --git a/variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK/CMakeLists.txt b/variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK/CMakeLists.txt
new file mode 100644
index 0000000000..271b27c96b
--- /dev/null
+++ b/variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK/CMakeLists.txt
@@ -0,0 +1,37 @@
+# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
+# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
+cmake_minimum_required(VERSION 3.21)
+
+add_library(variant INTERFACE)
+add_library(variant_usage INTERFACE)
+
+target_include_directories(variant_usage INTERFACE
+  .
+)
+
+
+target_link_libraries(variant_usage INTERFACE
+  base_config
+)
+
+target_link_libraries(variant INTERFACE variant_usage)
+
+
+
+add_library(variant_bin STATIC EXCLUDE_FROM_ALL
+  generic_clock.c
+  PeripheralPins.c
+  PeripheralPins_DAISY_PATCH_SM.c
+  PeripheralPins_DAISY_PETAL_SM.c
+  PeripheralPins_DAISY_SEED.c
+  variant_DAISY_PATCH_SM.cpp
+  variant_DAISY_PETAL_SM.cpp
+  variant_DAISY_SEED.cpp
+  variant_generic.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+
diff --git a/variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT/CMakeLists.txt b/variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT/CMakeLists.txt
@@ -0,0 +1,31 @@
+# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
+# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
+cmake_minimum_required(VERSION 3.21)
+
+add_library(variant INTERFACE)
+add_library(variant_usage INTERFACE)
+
+target_include_directories(variant_usage INTERFACE
+  .
+)
+
+
+target_link_libraries(variant_usage INTERFACE
+  base_config
+)
+
+target_link_libraries(variant INTERFACE variant_usage)
+
+
+
+add_library(variant_bin STATIC EXCLUDE_FROM_ALL
+  generic_clock.c
+  PeripheralPins.c
+  variant_generic.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+