diff --git a/ld/devices.data b/ld/devices.data
index 8dc1e6d7..57729c05 100644
--- a/ld/devices.data
+++ b/ld/devices.data
@@ -593,7 +593,7 @@ stm32l1 END ROM_OFF=0x08000000 RAM_OFF=0x20000000 CPU=cortex-m3 FPU=soft
 stm32l4 END ROM_OFF=0x08000000 RAM_OFF=0x20000000 RAM2_OFF=0x10000000 RAM3_OFF=0x20040000 CPU=cortex-m4 FPU=hard-fpv4-sp-d16
 stm32g0 END ROM_OFF=0x08000000 RAM_OFF=0x20000000 CPU=cortex-m0plus FPU=soft
 stm32g4 END ROM_OFF=0x08000000 RAM_OFF=0x20000000 CPU=cortex-m4 FPU=hard-fpv4-sp-d16
-stm32h7 END ROM_OFF=0x08000000 ROM1_OFF=0x08100000 RAM_OFF=0x24000000 RAM1_OFF=0x30000000 RAM2_OFF=0x30020000 RAM3_OFF=0x30040000 RAM4_OFF=0x38000000 CCM_OFF=0x20000000 CPU=cortex-m7 FPU=hard-fpv5-d16
+stm32h7 END ROM_OFF=0x08000000 ROM2_OFF=0x08100000 RAM_OFF=0x24000000 RAM2_OFF=0x30000000 RAM3_OFF=0x30020000 RAM4_OFF=0x30040000 RAM5_OFF=0x38000000 CCM_OFF=0x20000000 CPU=cortex-m7 FPU=hard-fpv5-d16
 stm32w END ROM_OFF=0x08000000 RAM_OFF=0x20000000 CPU=cortex-m3 FPU=soft
 stm32t END ROM_OFF=0x08000000 RAM_OFF=0x20000000 CPU=cortex-m3 FPU=soft
 
diff --git a/mk/genlink-config.mk b/mk/genlink-config.mk
index 4686fe6d..3f323611 100644
--- a/mk/genlink-config.mk
+++ b/mk/genlink-config.mk
@@ -41,6 +41,8 @@ ifeq ($(genlink_fpu),soft)
 ARCH_FLAGS	+= -msoft-float
 else ifeq ($(genlink_fpu),hard-fpv4-sp-d16)
 ARCH_FLAGS	+= -mfloat-abi=hard -mfpu=fpv4-sp-d16
+else ifeq ($(genlink_fpu),hard-fpv5-d16)
+ARCH_FLAGS      += -mfloat-abi=hard -mfpu=fpv5-d16
 else ifeq ($(genlink_fpu),hard-fpv5-sp-d16)
 ARCH_FLAGS      += -mfloat-abi=hard -mfpu=fpv5-sp-d16
 else