Merge #600

bors[bot] · burrbull · web-flow · commit 24370e51edf8 · 2021-08-24T21:15:35.000Z
600: fix broken rules r=adamgreig a=burrbull



Co-authored-by: Andrey Zgarbul &lt;zgarbul.andrey@gmail.com&gt;
diff --git a/devices/common_patches/f3_flash.yaml b/devices/common_patches/f3_flash.yaml
@@ -1,4 +1,7 @@
 FLASH:
+  _modify:
+    OBR:
+      resetValue: 0xFFFFFF0F
   ACR:
     _add:
       HLFCYA:
@@ -16,6 +19,5 @@ FLASH:
         name: "OBL_LAUNCH"
   OBR:
     _modify:
-      resetValue: 0xFFFFFF0F
       BOOT1:
         name: "nBOOT1"
diff --git a/devices/common_patches/f7_rcc_dckcfgr.yaml b/devices/common_patches/f7_rcc_dckcfgr.yaml
@@ -1,9 +1,8 @@
 RCC:
+  _modify:
+    DCKCFGR[12]:
+      resetValue: 0x00000000
   DCKCFGR1:
     _modify:
-      resetValue: 0x00000000
       PLLI2SDIV:
         name: PLLI2SDIVQ
-  DCKCFGR2:
-    _modify:
-      resetValue: 0x00000000
diff --git a/devices/common_patches/sdio_f446.yaml b/devices/common_patches/sdio_f446.yaml
@@ -5,6 +5,8 @@ _modify:
     groupName: SDIO
     addressBlock:
       size: "0x400"
+      offset: 0
+      usage: registers
 
 SDIO:
   _strip: SDMMC_
diff --git a/devices/stm32f373.yaml b/devices/stm32f373.yaml
@@ -87,6 +87,9 @@ CAN:
       - COMP1_2
 
 FLASH:
+  _modify:
+    OBR:
+      resetValue: 0xFFFFFF0F
   SR:
     _modify:
       WRPRT:
@@ -97,7 +100,6 @@ FLASH:
         name: "OBL_LAUNCH"
   OBR:
     _modify:
-      resetValue: 0xFFFFFF0F
       BOOT1:
         name: "nBOOT1"
 
diff --git a/devices/stm32g051.yaml b/devices/stm32g051.yaml
@@ -19,7 +19,7 @@ TIM1:
 TIM2:
   CCMR1_Output:
     _clear:
-      OC1M1:
+      - OC1M1
     _modify:
       OC1M1:
         name: OC1M
diff --git a/devices/stm32g0b1.yaml b/devices/stm32g0b1.yaml
@@ -20,7 +20,7 @@ TIM1:
 TIM2:
   CCMR1_Output:
     _clear:
-      OC1M1:
+      - OC1M1
     _modify:
       OC1M1:
         name: OC1M
diff --git a/devices/stm32g0c1.yaml b/devices/stm32g0c1.yaml
@@ -26,7 +26,7 @@ TIM1:
 TIM2:
   CCMR1_Output:
     _clear:
-      OC1M1:
+      - OC1M1
     _modify:
       OC1M1:
         name: OC1M
diff --git a/devices/stm32h7b3.yaml b/devices/stm32h7b3.yaml
@@ -63,6 +63,9 @@ RCC:
     _delete:
       - LPTIM4LPEN
       - LPTIM5LPEN
+  RSR,C1_RSR:
+    _clear:
+      - RMVF
 
 DBGMCU:
   APB4FZ1:
