diff --git a/cmake/boards_db.cmake b/cmake/boards_db.cmake
index f7dd909ed8..253a19646e 100644
--- a/cmake/boards_db.cmake
+++ b/cmake/boards_db.cmake
@@ -63829,7 +63829,7 @@ target_compile_options(GENERIC_G431MBTX_xusb_HSFS INTERFACE
 # GENERIC_G431R6IX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G431R6IX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)")
+set(GENERIC_G431R6IX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)")
 set(GENERIC_G431R6IX_MAXSIZE 32768)
 set(GENERIC_G431R6IX_MAXDATASIZE 32768)
 set(GENERIC_G431R6IX_MCU cortex-m4)
@@ -63911,7 +63911,7 @@ target_compile_options(GENERIC_G431R6IX_xusb_HSFS INTERFACE
 # GENERIC_G431R6TX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G431R6TX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)")
+set(GENERIC_G431R6TX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)")
 set(GENERIC_G431R6TX_MAXSIZE 32768)
 set(GENERIC_G431R6TX_MAXDATASIZE 32768)
 set(GENERIC_G431R6TX_MCU cortex-m4)
@@ -63993,7 +63993,7 @@ target_compile_options(GENERIC_G431R6TX_xusb_HSFS INTERFACE
 # GENERIC_G431R8IX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G431R8IX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)")
+set(GENERIC_G431R8IX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)")
 set(GENERIC_G431R8IX_MAXSIZE 65536)
 set(GENERIC_G431R8IX_MAXDATASIZE 32768)
 set(GENERIC_G431R8IX_MCU cortex-m4)
@@ -64075,7 +64075,7 @@ target_compile_options(GENERIC_G431R8IX_xusb_HSFS INTERFACE
 # GENERIC_G431R8TX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G431R8TX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)")
+set(GENERIC_G431R8TX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)")
 set(GENERIC_G431R8TX_MAXSIZE 65536)
 set(GENERIC_G431R8TX_MAXDATASIZE 32768)
 set(GENERIC_G431R8TX_MCU cortex-m4)
@@ -64157,7 +64157,7 @@ target_compile_options(GENERIC_G431R8TX_xusb_HSFS INTERFACE
 # GENERIC_G431RBIX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G431RBIX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)")
+set(GENERIC_G431RBIX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)")
 set(GENERIC_G431RBIX_MAXSIZE 131072)
 set(GENERIC_G431RBIX_MAXDATASIZE 32768)
 set(GENERIC_G431RBIX_MCU cortex-m4)
@@ -64239,7 +64239,7 @@ target_compile_options(GENERIC_G431RBIX_xusb_HSFS INTERFACE
 # GENERIC_G431RBTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G431RBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)")
+set(GENERIC_G431RBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)")
 set(GENERIC_G431RBTX_MAXSIZE 131072)
 set(GENERIC_G431RBTX_MAXDATASIZE 32768)
 set(GENERIC_G431RBTX_MCU cortex-m4)
@@ -64318,6 +64318,88 @@ target_compile_options(GENERIC_G431RBTX_xusb_HSFS INTERFACE
   "SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
 )
 
+# GENERIC_G431RBTXZ
+# -----------------------------------------------------------------------------
+
+set(GENERIC_G431RBTXZ_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)")
+set(GENERIC_G431RBTXZ_MAXSIZE 131072)
+set(GENERIC_G431RBTXZ_MAXDATASIZE 32768)
+set(GENERIC_G431RBTXZ_MCU cortex-m4)
+set(GENERIC_G431RBTXZ_FPCONF "-")
+add_library(GENERIC_G431RBTXZ INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ INTERFACE
+  "SHELL:-DSTM32G431xx  "
+  "SHELL:"
+  "SHELL:"
+  "SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
+  -mcpu=${GENERIC_G431RBTXZ_MCU}
+)
+target_compile_definitions(GENERIC_G431RBTXZ INTERFACE
+  "STM32G4xx"
+	"ARDUINO_GENERIC_G431RBTXZ"
+	"BOARD_NAME=\"GENERIC_G431RBTXZ\""
+	"BOARD_ID=GENERIC_G431RBTXZ"
+	"VARIANT_H=\"variant_generic.h\""
+)
+target_include_directories(GENERIC_G431RBTXZ INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/../system/STM32G4xx
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32G4xx_HAL_Driver/Inc
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32G4xx_HAL_Driver/Src
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/
+  ${GENERIC_G431RBTXZ_VARIANT_PATH}
+)
+
+target_link_options(GENERIC_G431RBTXZ INTERFACE
+  "LINKER:--default-script=${GENERIC_G431RBTXZ_VARIANT_PATH}/ldscript.ld"
+  "LINKER:--defsym=LD_FLASH_OFFSET=0x0"
+	"LINKER:--defsym=LD_MAX_SIZE=131072"
+	"LINKER:--defsym=LD_MAX_DATA_SIZE=32768"
+  "SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
+  -mcpu=${GENERIC_G431RBTXZ_MCU}
+)
+
+add_library(GENERIC_G431RBTXZ_serial_disabled INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ_serial_disabled INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G431RBTXZ_serial_generic INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ_serial_generic INTERFACE
+  "SHELL:-DHAL_UART_MODULE_ENABLED"
+)
+add_library(GENERIC_G431RBTXZ_serial_none INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ_serial_none INTERFACE
+  "SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
+)
+add_library(GENERIC_G431RBTXZ_usb_CDC INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ_usb_CDC INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
+)
+add_library(GENERIC_G431RBTXZ_usb_CDCgen INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ_usb_CDCgen INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
+)
+add_library(GENERIC_G431RBTXZ_usb_HID INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ_usb_HID INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
+)
+add_library(GENERIC_G431RBTXZ_usb_none INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ_usb_none INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G431RBTXZ_xusb_FS INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ_xusb_FS INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G431RBTXZ_xusb_HS INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ_xusb_HS INTERFACE
+  "SHELL:-DUSE_USB_HS"
+)
+add_library(GENERIC_G431RBTXZ_xusb_HSFS INTERFACE)
+target_compile_options(GENERIC_G431RBTXZ_xusb_HSFS INTERFACE
+  "SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
+)
+
 # GENERIC_G431V6TX
 # -----------------------------------------------------------------------------
 
@@ -64977,7 +65059,7 @@ target_compile_options(GENERIC_G441MBTX_xusb_HSFS INTERFACE
 # GENERIC_G441RBIX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G441RBIX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)")
+set(GENERIC_G441RBIX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)")
 set(GENERIC_G441RBIX_MAXSIZE 131072)
 set(GENERIC_G441RBIX_MAXDATASIZE 32768)
 set(GENERIC_G441RBIX_MCU cortex-m4)
@@ -65059,7 +65141,7 @@ target_compile_options(GENERIC_G441RBIX_xusb_HSFS INTERFACE
 # GENERIC_G441RBTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G441RBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)")
+set(GENERIC_G441RBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)")
 set(GENERIC_G441RBTX_MAXSIZE 131072)
 set(GENERIC_G441RBTX_MAXDATASIZE 32768)
 set(GENERIC_G441RBTX_MCU cortex-m4)
@@ -67109,7 +67191,7 @@ target_compile_options(GENERIC_G473PEIX_xusb_HSFS INTERFACE
 # GENERIC_G473QBTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G473QBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET")
+set(GENERIC_G473QBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET")
 set(GENERIC_G473QBTX_MAXSIZE 131072)
 set(GENERIC_G473QBTX_MAXDATASIZE 131072)
 set(GENERIC_G473QBTX_MCU cortex-m4)
@@ -67191,7 +67273,7 @@ target_compile_options(GENERIC_G473QBTX_xusb_HSFS INTERFACE
 # GENERIC_G473QCTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G473QCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET")
+set(GENERIC_G473QCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET")
 set(GENERIC_G473QCTX_MAXSIZE 262144)
 set(GENERIC_G473QCTX_MAXDATASIZE 131072)
 set(GENERIC_G473QCTX_MCU cortex-m4)
@@ -67273,7 +67355,7 @@ target_compile_options(GENERIC_G473QCTX_xusb_HSFS INTERFACE
 # GENERIC_G473QETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G473QETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET")
+set(GENERIC_G473QETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET")
 set(GENERIC_G473QETX_MAXSIZE 524288)
 set(GENERIC_G473QETX_MAXDATASIZE 131072)
 set(GENERIC_G473QETX_MCU cortex-m4)
@@ -67352,10 +67434,92 @@ target_compile_options(GENERIC_G473QETX_xusb_HSFS INTERFACE
   "SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
 )
 
+# GENERIC_G473QETXZ
+# -----------------------------------------------------------------------------
+
+set(GENERIC_G473QETXZ_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET")
+set(GENERIC_G473QETXZ_MAXSIZE 524288)
+set(GENERIC_G473QETXZ_MAXDATASIZE 131072)
+set(GENERIC_G473QETXZ_MCU cortex-m4)
+set(GENERIC_G473QETXZ_FPCONF "-")
+add_library(GENERIC_G473QETXZ INTERFACE)
+target_compile_options(GENERIC_G473QETXZ INTERFACE
+  "SHELL:-DSTM32G473xx  "
+  "SHELL:"
+  "SHELL:"
+  "SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
+  -mcpu=${GENERIC_G473QETXZ_MCU}
+)
+target_compile_definitions(GENERIC_G473QETXZ INTERFACE
+  "STM32G4xx"
+	"ARDUINO_GENERIC_G473QETXZ"
+	"BOARD_NAME=\"GENERIC_G473QETXZ\""
+	"BOARD_ID=GENERIC_G473QETXZ"
+	"VARIANT_H=\"variant_generic.h\""
+)
+target_include_directories(GENERIC_G473QETXZ INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/../system/STM32G4xx
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32G4xx_HAL_Driver/Inc
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32G4xx_HAL_Driver/Src
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/
+  ${GENERIC_G473QETXZ_VARIANT_PATH}
+)
+
+target_link_options(GENERIC_G473QETXZ INTERFACE
+  "LINKER:--default-script=${GENERIC_G473QETXZ_VARIANT_PATH}/ldscript.ld"
+  "LINKER:--defsym=LD_FLASH_OFFSET=0x0"
+	"LINKER:--defsym=LD_MAX_SIZE=524288"
+	"LINKER:--defsym=LD_MAX_DATA_SIZE=131072"
+  "SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
+  -mcpu=${GENERIC_G473QETXZ_MCU}
+)
+
+add_library(GENERIC_G473QETXZ_serial_disabled INTERFACE)
+target_compile_options(GENERIC_G473QETXZ_serial_disabled INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G473QETXZ_serial_generic INTERFACE)
+target_compile_options(GENERIC_G473QETXZ_serial_generic INTERFACE
+  "SHELL:-DHAL_UART_MODULE_ENABLED"
+)
+add_library(GENERIC_G473QETXZ_serial_none INTERFACE)
+target_compile_options(GENERIC_G473QETXZ_serial_none INTERFACE
+  "SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
+)
+add_library(GENERIC_G473QETXZ_usb_CDC INTERFACE)
+target_compile_options(GENERIC_G473QETXZ_usb_CDC INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
+)
+add_library(GENERIC_G473QETXZ_usb_CDCgen INTERFACE)
+target_compile_options(GENERIC_G473QETXZ_usb_CDCgen INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
+)
+add_library(GENERIC_G473QETXZ_usb_HID INTERFACE)
+target_compile_options(GENERIC_G473QETXZ_usb_HID INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
+)
+add_library(GENERIC_G473QETXZ_usb_none INTERFACE)
+target_compile_options(GENERIC_G473QETXZ_usb_none INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G473QETXZ_xusb_FS INTERFACE)
+target_compile_options(GENERIC_G473QETXZ_xusb_FS INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G473QETXZ_xusb_HS INTERFACE)
+target_compile_options(GENERIC_G473QETXZ_xusb_HS INTERFACE
+  "SHELL:-DUSE_USB_HS"
+)
+add_library(GENERIC_G473QETXZ_xusb_HSFS INTERFACE)
+target_compile_options(GENERIC_G473QETXZ_xusb_HSFS INTERFACE
+  "SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
+)
+
 # GENERIC_G473RBTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G473RBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET")
+set(GENERIC_G473RBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET")
 set(GENERIC_G473RBTX_MAXSIZE 131072)
 set(GENERIC_G473RBTX_MAXDATASIZE 131072)
 set(GENERIC_G473RBTX_MCU cortex-m4)
@@ -67437,7 +67601,7 @@ target_compile_options(GENERIC_G473RBTX_xusb_HSFS INTERFACE
 # GENERIC_G473RCTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G473RCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET")
+set(GENERIC_G473RCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET")
 set(GENERIC_G473RCTX_MAXSIZE 262144)
 set(GENERIC_G473RCTX_MAXDATASIZE 131072)
 set(GENERIC_G473RCTX_MCU cortex-m4)
@@ -67519,7 +67683,7 @@ target_compile_options(GENERIC_G473RCTX_xusb_HSFS INTERFACE
 # GENERIC_G473RETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G473RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET")
+set(GENERIC_G473RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET")
 set(GENERIC_G473RETX_MAXSIZE 524288)
 set(GENERIC_G473RETX_MAXDATASIZE 131072)
 set(GENERIC_G473RETX_MCU cortex-m4)
@@ -67598,6 +67762,88 @@ target_compile_options(GENERIC_G473RETX_xusb_HSFS INTERFACE
   "SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
 )
 
+# GENERIC_G473RETXZ
+# -----------------------------------------------------------------------------
+
+set(GENERIC_G473RETXZ_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET")
+set(GENERIC_G473RETXZ_MAXSIZE 524288)
+set(GENERIC_G473RETXZ_MAXDATASIZE 131072)
+set(GENERIC_G473RETXZ_MCU cortex-m4)
+set(GENERIC_G473RETXZ_FPCONF "-")
+add_library(GENERIC_G473RETXZ INTERFACE)
+target_compile_options(GENERIC_G473RETXZ INTERFACE
+  "SHELL:-DSTM32G473xx  "
+  "SHELL:"
+  "SHELL:"
+  "SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
+  -mcpu=${GENERIC_G473RETXZ_MCU}
+)
+target_compile_definitions(GENERIC_G473RETXZ INTERFACE
+  "STM32G4xx"
+	"ARDUINO_GENERIC_G473RETXZ"
+	"BOARD_NAME=\"GENERIC_G473RETXZ\""
+	"BOARD_ID=GENERIC_G473RETXZ"
+	"VARIANT_H=\"variant_generic.h\""
+)
+target_include_directories(GENERIC_G473RETXZ INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/../system/STM32G4xx
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32G4xx_HAL_Driver/Inc
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32G4xx_HAL_Driver/Src
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/
+  ${GENERIC_G473RETXZ_VARIANT_PATH}
+)
+
+target_link_options(GENERIC_G473RETXZ INTERFACE
+  "LINKER:--default-script=${GENERIC_G473RETXZ_VARIANT_PATH}/ldscript.ld"
+  "LINKER:--defsym=LD_FLASH_OFFSET=0x0"
+	"LINKER:--defsym=LD_MAX_SIZE=524288"
+	"LINKER:--defsym=LD_MAX_DATA_SIZE=131072"
+  "SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
+  -mcpu=${GENERIC_G473RETXZ_MCU}
+)
+
+add_library(GENERIC_G473RETXZ_serial_disabled INTERFACE)
+target_compile_options(GENERIC_G473RETXZ_serial_disabled INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G473RETXZ_serial_generic INTERFACE)
+target_compile_options(GENERIC_G473RETXZ_serial_generic INTERFACE
+  "SHELL:-DHAL_UART_MODULE_ENABLED"
+)
+add_library(GENERIC_G473RETXZ_serial_none INTERFACE)
+target_compile_options(GENERIC_G473RETXZ_serial_none INTERFACE
+  "SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
+)
+add_library(GENERIC_G473RETXZ_usb_CDC INTERFACE)
+target_compile_options(GENERIC_G473RETXZ_usb_CDC INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
+)
+add_library(GENERIC_G473RETXZ_usb_CDCgen INTERFACE)
+target_compile_options(GENERIC_G473RETXZ_usb_CDCgen INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
+)
+add_library(GENERIC_G473RETXZ_usb_HID INTERFACE)
+target_compile_options(GENERIC_G473RETXZ_usb_HID INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
+)
+add_library(GENERIC_G473RETXZ_usb_none INTERFACE)
+target_compile_options(GENERIC_G473RETXZ_usb_none INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G473RETXZ_xusb_FS INTERFACE)
+target_compile_options(GENERIC_G473RETXZ_xusb_FS INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G473RETXZ_xusb_HS INTERFACE)
+target_compile_options(GENERIC_G473RETXZ_xusb_HS INTERFACE
+  "SHELL:-DUSE_USB_HS"
+)
+add_library(GENERIC_G473RETXZ_xusb_HSFS INTERFACE)
+target_compile_options(GENERIC_G473RETXZ_xusb_HSFS INTERFACE
+  "SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
+)
+
 # GENERIC_G473VBHX
 # -----------------------------------------------------------------------------
 
@@ -68831,7 +69077,7 @@ target_compile_options(GENERIC_G474PEIX_xusb_HSFS INTERFACE
 # GENERIC_G474QBTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G474QBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET")
+set(GENERIC_G474QBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET")
 set(GENERIC_G474QBTX_MAXSIZE 131072)
 set(GENERIC_G474QBTX_MAXDATASIZE 131072)
 set(GENERIC_G474QBTX_MCU cortex-m4)
@@ -68913,7 +69159,7 @@ target_compile_options(GENERIC_G474QBTX_xusb_HSFS INTERFACE
 # GENERIC_G474QCTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G474QCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET")
+set(GENERIC_G474QCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET")
 set(GENERIC_G474QCTX_MAXSIZE 262144)
 set(GENERIC_G474QCTX_MAXDATASIZE 131072)
 set(GENERIC_G474QCTX_MCU cortex-m4)
@@ -68995,7 +69241,7 @@ target_compile_options(GENERIC_G474QCTX_xusb_HSFS INTERFACE
 # GENERIC_G474QETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G474QETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET")
+set(GENERIC_G474QETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET")
 set(GENERIC_G474QETX_MAXSIZE 524288)
 set(GENERIC_G474QETX_MAXDATASIZE 131072)
 set(GENERIC_G474QETX_MCU cortex-m4)
@@ -69077,7 +69323,7 @@ target_compile_options(GENERIC_G474QETX_xusb_HSFS INTERFACE
 # GENERIC_G474RBTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G474RBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET")
+set(GENERIC_G474RBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET")
 set(GENERIC_G474RBTX_MAXSIZE 131072)
 set(GENERIC_G474RBTX_MAXDATASIZE 131072)
 set(GENERIC_G474RBTX_MCU cortex-m4)
@@ -69159,7 +69405,7 @@ target_compile_options(GENERIC_G474RBTX_xusb_HSFS INTERFACE
 # GENERIC_G474RCTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G474RCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET")
+set(GENERIC_G474RCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET")
 set(GENERIC_G474RCTX_MAXSIZE 262144)
 set(GENERIC_G474RCTX_MAXDATASIZE 131072)
 set(GENERIC_G474RCTX_MCU cortex-m4)
@@ -69241,7 +69487,7 @@ target_compile_options(GENERIC_G474RCTX_xusb_HSFS INTERFACE
 # GENERIC_G474RETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G474RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET")
+set(GENERIC_G474RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET")
 set(GENERIC_G474RETX_MAXSIZE 524288)
 set(GENERIC_G474RETX_MAXDATASIZE 131072)
 set(GENERIC_G474RETX_MCU cortex-m4)
@@ -70061,7 +70307,7 @@ target_compile_options(GENERIC_G483PEIX_xusb_HSFS INTERFACE
 # GENERIC_G483QETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G483QETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET")
+set(GENERIC_G483QETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET")
 set(GENERIC_G483QETX_MAXSIZE 524288)
 set(GENERIC_G483QETX_MAXDATASIZE 131072)
 set(GENERIC_G483QETX_MCU cortex-m4)
@@ -70143,7 +70389,7 @@ target_compile_options(GENERIC_G483QETX_xusb_HSFS INTERFACE
 # GENERIC_G483RETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G483RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET")
+set(GENERIC_G483RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET")
 set(GENERIC_G483RETX_MAXSIZE 524288)
 set(GENERIC_G483RETX_MAXDATASIZE 131072)
 set(GENERIC_G483RETX_MCU cortex-m4)
@@ -70635,7 +70881,7 @@ target_compile_options(GENERIC_G484PEIX_xusb_HSFS INTERFACE
 # GENERIC_G484QETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G484QETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET")
+set(GENERIC_G484QETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET")
 set(GENERIC_G484QETX_MAXSIZE 524288)
 set(GENERIC_G484QETX_MAXDATASIZE 131072)
 set(GENERIC_G484QETX_MCU cortex-m4)
@@ -70717,7 +70963,7 @@ target_compile_options(GENERIC_G484QETX_xusb_HSFS INTERFACE
 # GENERIC_G484RETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G484RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET")
+set(GENERIC_G484RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET")
 set(GENERIC_G484RETX_MAXSIZE 524288)
 set(GENERIC_G484RETX_MAXDATASIZE 131072)
 set(GENERIC_G484RETX_MCU cortex-m4)
@@ -71619,7 +71865,7 @@ target_compile_options(GENERIC_G491METX_xusb_HSFS INTERFACE
 # GENERIC_G491RCIX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G491RCIX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)")
+set(GENERIC_G491RCIX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)")
 set(GENERIC_G491RCIX_MAXSIZE 262144)
 set(GENERIC_G491RCIX_MAXDATASIZE 131072)
 set(GENERIC_G491RCIX_MCU cortex-m4)
@@ -71701,7 +71947,7 @@ target_compile_options(GENERIC_G491RCIX_xusb_HSFS INTERFACE
 # GENERIC_G491RCTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G491RCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)")
+set(GENERIC_G491RCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)")
 set(GENERIC_G491RCTX_MAXSIZE 262144)
 set(GENERIC_G491RCTX_MAXDATASIZE 131072)
 set(GENERIC_G491RCTX_MCU cortex-m4)
@@ -71783,7 +72029,7 @@ target_compile_options(GENERIC_G491RCTX_xusb_HSFS INTERFACE
 # GENERIC_G491REIX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G491REIX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)")
+set(GENERIC_G491REIX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)")
 set(GENERIC_G491REIX_MAXSIZE 524288)
 set(GENERIC_G491REIX_MAXDATASIZE 131072)
 set(GENERIC_G491REIX_MCU cortex-m4)
@@ -71865,7 +72111,7 @@ target_compile_options(GENERIC_G491REIX_xusb_HSFS INTERFACE
 # GENERIC_G491RETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G491RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)")
+set(GENERIC_G491RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)")
 set(GENERIC_G491RETX_MAXSIZE 524288)
 set(GENERIC_G491RETX_MAXDATASIZE 131072)
 set(GENERIC_G491RETX_MCU cortex-m4)
@@ -71944,10 +72190,92 @@ target_compile_options(GENERIC_G491RETX_xusb_HSFS INTERFACE
   "SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
 )
 
+# GENERIC_G491RETXZ
+# -----------------------------------------------------------------------------
+
+set(GENERIC_G491RETXZ_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)")
+set(GENERIC_G491RETXZ_MAXSIZE 524288)
+set(GENERIC_G491RETXZ_MAXDATASIZE 131072)
+set(GENERIC_G491RETXZ_MCU cortex-m4)
+set(GENERIC_G491RETXZ_FPCONF "-")
+add_library(GENERIC_G491RETXZ INTERFACE)
+target_compile_options(GENERIC_G491RETXZ INTERFACE
+  "SHELL:-DSTM32G491xx  "
+  "SHELL:"
+  "SHELL:"
+  "SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
+  -mcpu=${GENERIC_G491RETXZ_MCU}
+)
+target_compile_definitions(GENERIC_G491RETXZ INTERFACE
+  "STM32G4xx"
+	"ARDUINO_GENERIC_G491RETXZ"
+	"BOARD_NAME=\"GENERIC_G491RETXZ\""
+	"BOARD_ID=GENERIC_G491RETXZ"
+	"VARIANT_H=\"variant_generic.h\""
+)
+target_include_directories(GENERIC_G491RETXZ INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/../system/STM32G4xx
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32G4xx_HAL_Driver/Inc
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32G4xx_HAL_Driver/Src
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/
+  ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/
+  ${GENERIC_G491RETXZ_VARIANT_PATH}
+)
+
+target_link_options(GENERIC_G491RETXZ INTERFACE
+  "LINKER:--default-script=${GENERIC_G491RETXZ_VARIANT_PATH}/ldscript.ld"
+  "LINKER:--defsym=LD_FLASH_OFFSET=0x0"
+	"LINKER:--defsym=LD_MAX_SIZE=524288"
+	"LINKER:--defsym=LD_MAX_DATA_SIZE=131072"
+  "SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
+  -mcpu=${GENERIC_G491RETXZ_MCU}
+)
+
+add_library(GENERIC_G491RETXZ_serial_disabled INTERFACE)
+target_compile_options(GENERIC_G491RETXZ_serial_disabled INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G491RETXZ_serial_generic INTERFACE)
+target_compile_options(GENERIC_G491RETXZ_serial_generic INTERFACE
+  "SHELL:-DHAL_UART_MODULE_ENABLED"
+)
+add_library(GENERIC_G491RETXZ_serial_none INTERFACE)
+target_compile_options(GENERIC_G491RETXZ_serial_none INTERFACE
+  "SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
+)
+add_library(GENERIC_G491RETXZ_usb_CDC INTERFACE)
+target_compile_options(GENERIC_G491RETXZ_usb_CDC INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
+)
+add_library(GENERIC_G491RETXZ_usb_CDCgen INTERFACE)
+target_compile_options(GENERIC_G491RETXZ_usb_CDCgen INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
+)
+add_library(GENERIC_G491RETXZ_usb_HID INTERFACE)
+target_compile_options(GENERIC_G491RETXZ_usb_HID INTERFACE
+  "SHELL:-DUSBCON  -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
+)
+add_library(GENERIC_G491RETXZ_usb_none INTERFACE)
+target_compile_options(GENERIC_G491RETXZ_usb_none INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G491RETXZ_xusb_FS INTERFACE)
+target_compile_options(GENERIC_G491RETXZ_xusb_FS INTERFACE
+  "SHELL:"
+)
+add_library(GENERIC_G491RETXZ_xusb_HS INTERFACE)
+target_compile_options(GENERIC_G491RETXZ_xusb_HS INTERFACE
+  "SHELL:-DUSE_USB_HS"
+)
+add_library(GENERIC_G491RETXZ_xusb_HSFS INTERFACE)
+target_compile_options(GENERIC_G491RETXZ_xusb_HSFS INTERFACE
+  "SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
+)
+
 # GENERIC_G491REYX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G491REYX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)")
+set(GENERIC_G491REYX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)")
 set(GENERIC_G491REYX_MAXSIZE 524288)
 set(GENERIC_G491REYX_MAXDATASIZE 131072)
 set(GENERIC_G491REYX_MCU cortex-m4)
@@ -72521,7 +72849,7 @@ target_compile_options(GENERIC_G4A1METX_xusb_HSFS INTERFACE
 # GENERIC_G4A1REIX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G4A1REIX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)")
+set(GENERIC_G4A1REIX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)")
 set(GENERIC_G4A1REIX_MAXSIZE 524288)
 set(GENERIC_G4A1REIX_MAXDATASIZE 131072)
 set(GENERIC_G4A1REIX_MCU cortex-m4)
@@ -72603,7 +72931,7 @@ target_compile_options(GENERIC_G4A1REIX_xusb_HSFS INTERFACE
 # GENERIC_G4A1RETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G4A1RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)")
+set(GENERIC_G4A1RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)")
 set(GENERIC_G4A1RETX_MAXSIZE 524288)
 set(GENERIC_G4A1RETX_MAXDATASIZE 131072)
 set(GENERIC_G4A1RETX_MCU cortex-m4)
@@ -72685,7 +73013,7 @@ target_compile_options(GENERIC_G4A1RETX_xusb_HSFS INTERFACE
 # GENERIC_G4A1REYX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_G4A1REYX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)")
+set(GENERIC_G4A1REYX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)")
 set(GENERIC_G4A1REYX_MAXSIZE 524288)
 set(GENERIC_G4A1REYX_MAXDATASIZE 131072)
 set(GENERIC_G4A1REYX_MCU cortex-m4)
@@ -102493,7 +102821,7 @@ target_compile_options(NUCLEO_G431KB_xusb_HSFS INTERFACE
 # NUCLEO_G431RB
 # -----------------------------------------------------------------------------
 
-set(NUCLEO_G431RB_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)")
+set(NUCLEO_G431RB_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)")
 set(NUCLEO_G431RB_MAXSIZE 131072)
 set(NUCLEO_G431RB_MAXDATASIZE 32768)
 set(NUCLEO_G431RB_MCU cortex-m4)
@@ -102575,7 +102903,7 @@ target_compile_options(NUCLEO_G431RB_xusb_HSFS INTERFACE
 # NUCLEO_G474RE
 # -----------------------------------------------------------------------------
 
-set(NUCLEO_G474RE_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET")
+set(NUCLEO_G474RE_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET")
 set(NUCLEO_G474RE_MAXSIZE 524288)
 set(NUCLEO_G474RE_MAXDATASIZE 131072)
 set(NUCLEO_G474RE_MCU cortex-m4)
diff --git a/variants/STM32G4xx/G411C(6-8-B)T/CMakeLists.txt b/variants/STM32G4xx/G411C(6-8-B)T/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G411C(6-8-B)T/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
+)
+
diff --git a/variants/STM32G4xx/G411C(6-8-B)U/CMakeLists.txt b/variants/STM32G4xx/G411C(6-8-B)U/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G411C(6-8-B)U/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
+)
+
diff --git a/variants/STM32G4xx/G411K(6-8-B)(T-U)/CMakeLists.txt b/variants/STM32G4xx/G411K(6-8-B)(T-U)/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G411K(6-8-B)(T-U)/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
+)
+
diff --git a/variants/STM32G4xx/G411M(6-8-B)T/CMakeLists.txt b/variants/STM32G4xx/G411M(6-8-B)T/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G411M(6-8-B)T/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
+)
+
diff --git a/variants/STM32G4xx/G411R(6-8-B)T/CMakeLists.txt b/variants/STM32G4xx/G411R(6-8-B)T/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G411R(6-8-B)T/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
+)
+
diff --git a/variants/STM32G4xx/G414C(B-C)T/CMakeLists.txt b/variants/STM32G4xx/G414C(B-C)T/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G414C(B-C)T/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
+)
+
diff --git a/variants/STM32G4xx/G414C(B-C)U/CMakeLists.txt b/variants/STM32G4xx/G414C(B-C)U/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G414C(B-C)U/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
+)
+
diff --git a/variants/STM32G4xx/G414M(B-C)T/CMakeLists.txt b/variants/STM32G4xx/G414M(B-C)T/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G414M(B-C)T/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
+)
+
diff --git a/variants/STM32G4xx/G414R(B-C)T/CMakeLists.txt b/variants/STM32G4xx/G414R(B-C)T/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G414R(B-C)T/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
+)
+
diff --git a/variants/STM32G4xx/G414V(B-C)T/CMakeLists.txt b/variants/STM32G4xx/G414V(B-C)T/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G414V(B-C)T/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
+)
+
diff --git a/variants/STM32G4xx/G431CBTxZ/CMakeLists.txt b/variants/STM32G4xx/G431CBTxZ/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G431CBTxZ/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
+)
+
diff --git a/variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)/CMakeLists.txt b/variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)/CMakeLists.txt
new file mode 100644
index 0000000000..a2eea5d929
--- /dev/null
+++ b/variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)/CMakeLists.txt
@@ -0,0 +1,32 @@
+# 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
+  variant_NUCLEO_G431RB.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+
diff --git a/variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET/CMakeLists.txt b/variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET/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
+)
+
diff --git a/variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET/CMakeLists.txt b/variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET/CMakeLists.txt
new file mode 100644
index 0000000000..ead531ad14
--- /dev/null
+++ b/variants/STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET/CMakeLists.txt
@@ -0,0 +1,32 @@
+# 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
+  variant_NUCLEO_G474RE.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+
diff --git a/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)/CMakeLists.txt b/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)/CMakeLists.txt
new file mode 100644
index 0000000000..2a4d55b6b1
--- /dev/null
+++ b/variants/STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)/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
+)
+