Merge #653 #660

bors[bot] · richardeoin · burrbull · web-flow · commit 3c5ddb045513 · 2021-11-20T21:31:45.000Z
653: Fix rename of H7 RM0455 OCTOSPI peripheral r=adamgreig a=richardeoin

Previous modification did not work as this peripheral is `derivedFrom` OCTOSPI in the original SVD

660: L4 Firewall same as L0 r=adamgreig a=burrbull



Co-authored-by: Richard Meadows &lt;962920+richardeoin@users.noreply.github.com&gt;
Co-authored-by: Andrey Zgarbul &lt;zgarbul.andrey@gmail.com&gt;
diff --git a/devices/common_patches/h7_common_highmemory.yaml b/devices/common_patches/h7_common_highmemory.yaml
@@ -12,8 +12,6 @@ _modify:
     name: FDCAN2
   DAC:
     name: DAC1
-  OCTOSPI1_CONTROL_REGISTER:
-    name: OCTOSPI1
 
 # The SVD is just quite different to the RM for all these registers.
 # We'll go with the RM convention even though it is inconsistent too.
@@ -313,6 +311,8 @@ AXI:
 # Work around the DMA_STR? interrupt mess in the SVD.
 # Some interrupts are on DMA2 instead on DMA1 and/or called DMA_STR? without
 # the numeral.
+#
+# Since it is not possible to modify a derivedFrom peripheral, we delete it first
 
 _delete:
   - DMA2
@@ -322,6 +322,7 @@ _delete:
   - UART8
   - USART9
   - USART10
+  - OCTOSPI1_CONTROL_REGISTER
 
 _add:
   DMA2:
@@ -394,6 +395,13 @@ _add:
       USART10:
         description: USART10 global interrupt
         value: 141
+  OCTOSPI1:
+    derivedFrom: OCTOSPI2
+    baseAddress: 0x52005000
+    interrupts:
+      OCTOSPI1:
+        description: OCTOSPI global interrupt
+        value: 92
   DAC2:
     derivedFrom: DAC1
     baseAddress: 0x58003400
diff --git a/devices/stm32l0x0.yaml b/devices/stm32l0x0.yaml
@@ -89,7 +89,7 @@ _include:
  - ../peripherals/dma/dma_v1_with_remapping.yaml
  - ../peripherals/exti/exti.yaml
  - ../peripherals/flash/flash_l0.yaml
- - ../peripherals/fw/fw_l0.yaml
+ - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/gpio/gpio_l0.yaml
  - ../peripherals/i2c/i2c_v2.yaml
  - ../peripherals/iwdg/iwdg_with_WINR.yaml
diff --git a/devices/stm32l0x1.yaml b/devices/stm32l0x1.yaml
@@ -139,7 +139,7 @@ _include:
  - ../peripherals/dma/dma_v1_with_remapping.yaml
  - ../peripherals/exti/exti.yaml
  - ../peripherals/flash/flash_l0.yaml
- - ../peripherals/fw/fw_l0.yaml
+ - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/gpio/gpio_l0.yaml
  - ../peripherals/i2c/i2c_v2.yaml
  - ../peripherals/iwdg/iwdg_with_WINR.yaml
diff --git a/devices/stm32l0x2.yaml b/devices/stm32l0x2.yaml
@@ -140,7 +140,7 @@ _include:
  - ../peripherals/dma/dma_v1_with_remapping.yaml
  - ../peripherals/exti/exti.yaml
  - ../peripherals/flash/flash_l0.yaml
- - ../peripherals/fw/fw_l0.yaml
+ - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/gpio/gpio_l0.yaml
  - ../peripherals/i2c/i2c_v2.yaml
  - ../peripherals/iwdg/iwdg_with_WINR.yaml
diff --git a/devices/stm32l0x3.yaml b/devices/stm32l0x3.yaml
@@ -150,7 +150,7 @@ _include:
  - ../peripherals/dma/dma_v1_with_remapping.yaml
  - ../peripherals/exti/exti.yaml
  - ../peripherals/flash/flash_l0.yaml
- - ../peripherals/fw/fw_l0.yaml
+ - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/gpio/gpio_l0.yaml
  - ../peripherals/i2c/i2c_v2.yaml
  - ../peripherals/iwdg/iwdg_with_WINR.yaml
diff --git a/devices/stm32l412.yaml b/devices/stm32l412.yaml
@@ -233,3 +233,4 @@ MPU:
 # Most of the other patches for this device are common with the L4x2 device.
 _include:
   - ./common_patches/stm32l4x2_l412.yaml
+  - ../peripherals/fw/fw_l0_l4.yaml
diff --git a/devices/stm32l4r9.yaml b/devices/stm32l4r9.yaml
@@ -72,6 +72,7 @@ _include:
  - common_patches/rtc/rtc_cr.yaml
  - common_patches/tsc/tsc.yaml
  - ./common_patches/flash/flash_boot0s.yaml
+ - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/sai/sai.yaml
  - ../peripherals/dma/dma2d_v1.yaml
  - common_patches/usb_otg/otg_fs_remove_prefix.yaml
diff --git a/devices/stm32l4x1.yaml b/devices/stm32l4x1.yaml
@@ -124,6 +124,7 @@ _include:
  - common_patches/tsc/tsc.yaml
  - common_patches/fpu_interrupt.yaml
  - ./common_patches/flash/flash_boot0s.yaml
+ - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/sai/sai.yaml
  - ./common_patches/l4_adc_common.yaml
  - ./common_patches/l4_adc_smpr.yaml
diff --git a/devices/stm32l4x2.yaml b/devices/stm32l4x2.yaml
@@ -9,3 +9,4 @@ MPU:
 _include:
  - ./common_patches/stm32l4x2_l412.yaml
  - common_patches/rtc/rtc_bkpr.yaml
+ - ../peripherals/fw/fw_l0_l4.yaml
diff --git a/devices/stm32l4x3.yaml b/devices/stm32l4x3.yaml
@@ -154,6 +154,7 @@ _include:
  - common_patches/rtc/rtc_cr.yaml
  - common_patches/tsc/tsc.yaml
  - ./common_patches/flash/flash_boot0s.yaml
+ - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/sai/sai.yaml
  - common_patches/dma_interrupt_names.yaml
  - ./common_patches/l4_adc_common.yaml
diff --git a/devices/stm32l4x5.yaml b/devices/stm32l4x5.yaml
@@ -173,6 +173,7 @@ _include:
  - common_patches/rtc/rtc_cr.yaml
  - common_patches/tsc/tsc.yaml
  - ./common_patches/flash/flash_boot0s.yaml
+ - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/sai/sai.yaml
  - common_patches/dma_interrupt_names.yaml
  - ./common_patches/l4_adc_smpr.yaml
diff --git a/devices/stm32l4x6.yaml b/devices/stm32l4x6.yaml
@@ -80,6 +80,7 @@ _include:
  - common_patches/rtc/rtc_cr.yaml
  - common_patches/tsc/tsc.yaml
  - ./common_patches/flash/flash_boot0s.yaml
+ - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/sai/sai.yaml
  - ../peripherals/dma/dma2d_v1.yaml
  - ./common_patches/l4_spi.yaml
diff --git a/peripherals/fw/fw_l0_l4.yaml b/peripherals/fw/fw_l0_l4.yaml
@@ -1,6 +1,6 @@
-# This FW is used on the STM32L0 families.
+# This FW is used on the STM32L0/L4 families.
 
-"FW":
+"FW,FIREWALL":
   CSSA:
     ADD: [0, 0xFFFF]
   CSL:
