diff --git a/ld/devices.data b/ld/devices.data
index c02af572..65684cdc 100644
--- a/ld/devices.data
+++ b/ld/devices.data
@@ -248,13 +248,14 @@ stm32g0[78][01]?b* stm32g0 ROM=128K RAM=36K
 stm32g0[BC]1?c* stm32g0 ROM=256K RAM=128K
 stm32g0[BC]1?e* stm32g0 ROM=512K RAM=128K
 
-stm32g4?1?6* stm32g4 ROM=32K RAM=32K
-stm32g4?1?8* stm32g4 ROM=64K RAM=32K
-stm32g4?1?b* stm32g4 ROM=128K RAM=32K
-stm32g4?1?c* stm32g4 ROM=256K RAM=112K
-stm32g4?[34]?b* stm32g4 ROM=128K RAM=128K
-stm32g4?[34]?c* stm32g4 ROM=256K RAM=128K
-stm32g4?[34]?e* stm32g4 ROM=512K RAM=128K
+stm32g4?1?6* stm32g4ccm ROM=32K RAM=22K CCM=10K
+stm32g4?1?8* stm32g4ccm ROM=64K RAM=22K CCM=10K
+stm32g4?1?b* stm32g4ccm ROM=128K RAM=22K CCM=10K
+stm32g4?1?c* stm32g4ccm ROM=256K RAM=96K CCM=16K
+stm32g4?1?e* stm32g4ccm ROM=512K RAM=96K CCM=16K
+stm32g4?[34]?b* stm32g4ccm ROM=128K RAM=96K CCM=32K
+stm32g4?[34]?c* stm32g4ccm ROM=256K RAM=96K CCM=32K
+stm32g4?[34]?e* stm32g4ccm ROM=512K RAM=96K CCM=32K
 
 ################################################################################
 # the SAM3 chips
@@ -492,6 +493,7 @@ pac5556 pac55xx ROM=128K RAM=32K
 stm32f3ccm stm32f3 CCM_OFF=0x10000000
 stm32f4ccm stm32f4 CCM_OFF=0x10000000
 stm32f7ccm stm32f7 CCM_OFF=0x20000000
+stm32g4ccm stm32g4 CCM_OFF=0x10000000
 stm32l1eep stm32l1 EEP_OFF=0x08080000
 
 ################################################################################
@@ -526,6 +528,7 @@ stm32l0 END ROM_OFF=0x08000000 RAM_OFF=0x20000000 CPU=cortex-m0plus FPU=soft
 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
 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