Merge pull request #536 from asbarnes/personal/assafb/stm32h_fmc_reg_address_fix

Dirbaio · web-flow · commit 8d6769ebf7fc · 2024-11-07T20:17:08.000Z
FMC Base Address Fix
diff --git a/d.ps1 b/d.ps1
@@ -6,7 +6,7 @@ param (
     [string]$peri
 )
 
-$REV="74b97817d4c4ed0db9d19a8eac46720b3c5b0d57"
+$REV="709c1060ac2ec57f6042f2b4eb9cf8c1821a6c57"
 
 Switch ($CMD)
 {
diff --git a/stm32-data-gen/src/header.rs b/stm32-data-gen/src/header.rs
@@ -185,7 +185,7 @@ impl Defines {
                 &["ADC1_COMMON_BASE", "ADC_COMMON_BASE", "ADC1_COMMON", "ADC_COMMON"],
             ),
             ("CAN", &["CAN_BASE", "CAN1_BASE"]),
-            ("FMC", &["FMC_BASE", "FMC_R_BASE"]),
+            ("FMC", &["FMC_R_BASE", "FMC_R_BASE_NS"]),
             ("FSMC", &["FSMC_R_BASE"]),
             ("USB", &["USB_BASE", "USB_DRD_BASE", "USB_BASE_NS", "USB_DRD_BASE_NS"]),
             (

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ impl Defines {`
`185`	`185`	`&["ADC1_COMMON_BASE", "ADC_COMMON_BASE", "ADC1_COMMON", "ADC_COMMON"],`
`186`	`186`	`),`
`187`	`187`	`("CAN", &["CAN_BASE", "CAN1_BASE"]),`
`188`		`- ("FMC", &["FMC_BASE", "FMC_R_BASE"]),`
	`188`	`+ ("FMC", &["FMC_R_BASE", "FMC_R_BASE_NS"]),`
`189`	`189`	`("FSMC", &["FSMC_R_BASE"]),`
`190`	`190`	`("USB", &["USB_BASE", "USB_DRD_BASE", "USB_BASE_NS", "USB_DRD_BASE_NS"]),`
`191`	`191`	`(`