Add dual bank information for the G4

Author: diondokter

stm32-data-gen/src/chips.rs

@@ -808,14 +808,14 @@ fn process_chip(
 ) -> Result<(), anyhow::Error> {
     let chip = chips.get(chip_name).unwrap();
     let docs = docs.documents_for(chip_name);
-    let chip = stm32_data_serde::Chip {
+    let mut chip = stm32_data_serde::Chip {
         name: chip_name.to_string(),
         family: group.family.clone().unwrap(),
         line: group.line.clone().unwrap(),
         die: group.die.clone().unwrap(),
         device_id: u16::from_str_radix(&group.die.as_ref().unwrap()[3..], 16).unwrap(),
         packages: chip.packages.clone(),
-        memory: memory::get(chip_name),
+        memory: memory::get(chip_name, false).unwrap(),
         docs,
         cores: cores.to_vec(),
     };
@@ -824,6 +824,14 @@ fn process_chip(
 
     let dump = serde_json::to_string_pretty(&chip)?;
     std::fs::write(format!("build/data/chips/{chip_name}.json"), dump)?;
+
+    if let Some(dbank_memory) = memory::get(chip_name, true) {
+        chip.memory = dbank_memory;
+        crate::check::check(&chip);
+
+        let dump = serde_json::to_string_pretty(&chip)?;
+        std::fs::write(format!("build/data/chips/{chip_name}_dual-bank.json"), dump)?;
+    }
     Ok(())
 }
 

stm32-data-gen/src/memory.rs

@@ -185,6 +185,9 @@ static MEMS: RegexMap<&[Mem]> = RegexMap::new(&[
     ("STM32G4[34]..B",               mem!(BANK_1 { 0x08000000 128 }, CCMRAM_ICODE { 0x10000000 10 }, SRAM1 { 0x20000000 16 }, SRAM2 { 0x20004000 6 }, CCMRAM_DCODE { 0x20005800 10 })),
     ("STM32G49..C",                  mem!(BANK_1 { 0x08000000 256 }, CCMRAM_ICODE { 0x10000000 16 }, SRAM1 { 0x20000000 80 }, SRAM2 { 0x20014000 16 }, CCMRAM_DCODE { 0x20018000 16 })),
     ("STM32G4[9A]..E",               mem!(BANK_1 { 0x08000000 512 }, CCMRAM_ICODE { 0x10000000 16 }, SRAM1 { 0x20000000 80 }, SRAM2 { 0x20014000 16 }, CCMRAM_DCODE { 0x20018000 16 })),
+    ("dual-bank_STM32G47..B",        mem!(BANK_1 { 0x08000000 64 }, BANK_2 { 0x08040000 64 }, CCMRAM_ICODE { 0x10000000 32 }, SRAM1 { 0x20000000 80 }, SRAM2 { 0x20014000 16 }, CCMRAM_DCODE { 0x20018000 32 })),
+    ("dual-bank_STM32G47..C",        mem!(BANK_1 { 0x08000000 128 }, BANK_2 { 0x08040000 128 }, CCMRAM_ICODE { 0x10000000 32 }, SRAM1 { 0x20000000 80 }, SRAM2 { 0x20014000 16 }, CCMRAM_DCODE { 0x20018000 32 })),
+    ("dual-bank_STM32G4[78]..E",     mem!(BANK_1 { 0x08000000 256 }, BANK_2 { 0x08040000 256 }, CCMRAM_ICODE { 0x10000000 32 }, SRAM1 { 0x20000000 80 }, SRAM2 { 0x20014000 16 }, CCMRAM_DCODE { 0x20018000 32 })),
     ("STM32G47..B",                  mem!(BANK_1 { 0x08000000 128 }, CCMRAM_ICODE { 0x10000000 32 }, SRAM1 { 0x20000000 80 }, SRAM2 { 0x20014000 16 }, CCMRAM_DCODE { 0x20018000 32 })),
     ("STM32G47..C",                  mem!(BANK_1 { 0x08000000 256 }, CCMRAM_ICODE { 0x10000000 32 }, SRAM1 { 0x20000000 80 }, SRAM2 { 0x20014000 16 }, CCMRAM_DCODE { 0x20018000 32 })),
     ("STM32G4[78]..E",               mem!(BANK_1 { 0x08000000 512 }, CCMRAM_ICODE { 0x10000000 32 }, SRAM1 { 0x20000000 80 }, SRAM2 { 0x20014000 16 }, CCMRAM_DCODE { 0x20018000 32 })),
@@ -322,6 +325,7 @@ static FLASH_INFO: RegexMap<FlashInfo> = RegexMap::new(&[
     ("STM32F7[4567].*",         FlashInfo{ erase_value: 0xFF, write_size: 16, erase_size: &[( 32*1024, 4), (128*1024, 1), ( 256*1024, 0)] }),
     ("STM32F7.*",               FlashInfo{ erase_value: 0xFF, write_size: 16, erase_size: &[( 16*1024, 4), (64*1024, 1), ( 128*1024, 0)] }),
     ("STM32G0.*",               FlashInfo{ erase_value: 0xFF, write_size:  8, erase_size: &[(  2*1024, 0)] }),
+    ("dual-bank_STM32G4[78].*", FlashInfo{ erase_value: 0xFF, write_size:  8, erase_size: &[(  2*1024, 0)] }),
     ("STM32G4[78].*",           FlashInfo{ erase_value: 0xFF, write_size:  8, erase_size: &[(  4*1024, 0)] }),
     ("STM32G4.*",               FlashInfo{ erase_value: 0xFF, write_size:  8, erase_size: &[(  2*1024, 0)] }),
     ("STM32H5.*",               FlashInfo{ erase_value: 0xFF, write_size: 16, erase_size: &[(  8*1024, 0)] }),
@@ -342,9 +346,9 @@ static FLASH_INFO: RegexMap<FlashInfo> = RegexMap::new(&[
     ("STM32.*",                 FlashInfo{ erase_value: 0xFF, write_size:  8, erase_size: &[(  2*1024, 0)] }),
 ]);
 
-pub fn get(chip: &str) -> Vec<Memory> {
-    let mems = *MEMS.must_get(chip);
-    let flash = FLASH_INFO.must_get(chip);
+pub fn get(chip: &str, dual_bank_variant: bool) -> Option<Vec<Memory>> {
+    let mems = *MEMS.get(&format!("{}{chip}", if dual_bank_variant { "dual-bank_" } else { "" }))?;
+    let flash = FLASH_INFO.get(&format!("{}{chip}", if dual_bank_variant { "dual-bank_" } else { "" }))?;
 
     let mut res = Vec::new();
 
@@ -421,5 +425,5 @@ pub fn get(chip: &str) -> Vec<Memory> {
 
     res.sort_by_key(|m| (m.address, m.name.clone()));
 
-    res
+    Some(res)
 }