diff --git a/stm32-data-gen/src/memory.rs b/stm32-data-gen/src/memory.rs
index ad7c627..b09c7f9 100644
--- a/stm32-data-gen/src/memory.rs
+++ b/stm32-data-gen/src/memory.rs
@@ -132,9 +132,9 @@ static MEMS: RegexMap<&[Mem]> = RegexMap::new(&[
     ("STM32G07..8",                  mem!(BANK_1 0x08000000 64, SRAM 0x20000000 32)),
     ("STM32G0B..B",                  mem!(BANK_1 0x08000000 128, SRAM 0x20000000 128)),
     // G4. TODO: check
-    ("STM32G4...6",                  mem!(BANK_1 0x08000000 32, SRAM 0x20000000 20, SRAM2 0x20004000 0)),
-    ("STM32G4...8",                  mem!(BANK_1 0x08000000 64, SRAM 0x20000000 20, SRAM2 0x20004000 0)),
-    ("STM32G4[34]..B",               mem!(BANK_1 0x08000000 128, SRAM 0x20000000 20, SRAM2 0x20004000 0)),
+    ("STM32G4...6",                  mem!(BANK_1 0x08000000 32, CCM_SRAM_ICODE 0x10000000 10, SRAM1 0x20000000 16, SRAM2 0x20004000 6, CCM_SRAM_DCODE 0x20005800 10)),
+    ("STM32G4...8",                  mem!(BANK_1 0x08000000 64, CCM_SRAM_ICODE 0x10000000 10, SRAM1 0x20000000 16, SRAM2 0x20004000 6, CCM_SRAM_DCODE 0x20005800 10)),
+    ("STM32G4[34]..B",               mem!(BANK_1 0x08000000 128, CCM_SRAM_ICODE 0x10000000 10, SRAM1 0x20000000 16, SRAM2 0x20004000 6, CCM_SRAM_DCODE 0x20005800 10)),
     ("STM32G4[78]..E",               mem!(BANK_1 0x08000000 512, SRAM 0x20000000 96, SRAM2 0x20014000 0)),
     ("STM32G4[9A]..E",               mem!(BANK_1 0x08000000 512, SRAM 0x20000000 32, SRAM2 0x20014000 0)),
     ("STM32G47..B",                  mem!(BANK_1 0x08000000 128, SRAM 0x20000000 96, SRAM2 0x20014000 0)),