From eb7491c6970f244aa7dabec46f7c2431e28daceb Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Sun, 16 Jan 2022 08:21:47 +0300 Subject: [PATCH] clear all vendor provided enumeratedValues for g0 and h7b3 --- CHANGELOG.md | 6 ++++ .../common_patches/h7_common_highmemory.yaml | 34 ------------------- devices/common_patches/tim/v2/g0_1.yaml | 4 --- devices/stm32g050.yaml | 10 ++---- devices/stm32g051.yaml | 9 ++--- devices/stm32g061.yaml | 10 ++---- devices/stm32g070.yaml | 11 ++---- devices/stm32g071.yaml | 11 ++---- devices/stm32g0b0.yaml | 10 ++---- devices/stm32g0b1.yaml | 10 ++---- devices/stm32g0c1.yaml | 13 ++----- devices/stm32h7b3.yaml | 6 ++-- 12 files changed, 24 insertions(+), 110 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f1f95c10..0044fa785 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ Family-specific: +* G0: + * Clear all vendor provided enumeratedValues + +* H7: + * h7b3: clear all enumeratedValues + * F7: * Add SDMMC2EN and SDMMC2RST to F765, F7x7, F7x9 (#662) diff --git a/devices/common_patches/h7_common_highmemory.yaml b/devices/common_patches/h7_common_highmemory.yaml index dea17ea4a..cd62a423f 100644 --- a/devices/common_patches/h7_common_highmemory.yaml +++ b/devices/common_patches/h7_common_highmemory.yaml @@ -503,8 +503,6 @@ RCC: bitWidth: 1 CR: - _clear: - "*" _modify: RC48ON: name: HSI48ON @@ -515,16 +513,12 @@ RCC: RC48CAL: name: HSI48CAL CFGR: - _clear: - "*" _modify: MCO1SEL: name: MCO1 MCO2SEL: name: MCO2 CIER: - _clear: - "*" _modify: RC48RDYIE: name: HSI48RDYIE @@ -533,23 +527,14 @@ RCC: RC48RDYF: name: HSI48RDYF CICR: - _clear: - "*" _modify: RC48RDYC: name: HSI48RDYC BDCR: - _clear: - "*" _modify: RTCSRC: name: RTCSEL - CSR: - _clear: - "*" PLL2DIVR: - _clear: - "*" _modify: DIVR1: name: DIVR2 @@ -559,15 +544,6 @@ RCC: name: DIVP2 DIVN1: name: DIVN2 - "A?B?RSTR,A?B??RSTR": - _clear: - "*RST" - "A?B?ENR,A?B??ENR,C1_A?B?ENR,C1_A?B??ENR": - _clear: - "*EN" - "A?B?LPENR,A?B??LPENR,C1_A?B?LPENR,C1_A?B??LPENR": - _clear: - "*LPEN" APB1LRSTR: _modify: USART7RST: @@ -639,16 +615,6 @@ RCC: FLITFLPEN: name: FLASHPREN description: "Flash interface clock enable during csleep mode" - RSR: - _clear: - "*RSTF" - PLLCKSELR,PLLCFGR,PLL1DIVR,CDCFGR?,CDCCIPR,CDCCIP?R: - _clear: - "*" - SRDAMR,SRDCCIPR: - _clear: - "*" - SYSCFG: _modify: diff --git a/devices/common_patches/tim/v2/g0_1.yaml b/devices/common_patches/tim/v2/g0_1.yaml index bd23d4096..7f46ba031 100644 --- a/devices/common_patches/tim/v2/g0_1.yaml +++ b/devices/common_patches/tim/v2/g0_1.yaml @@ -1,7 +1,5 @@ "TIM1,TIM15": CCMR1_Output: - _clear: - - OC1M? _modify: OC2M1: name: OC2M @@ -27,8 +25,6 @@ TIM1: "TIM1[46]": CCMR1_Output: - _clear: - - OC1M? _modify: OC1M1: name: OC1M diff --git a/devices/stm32g050.yaml b/devices/stm32g050.yaml index 318c127fa..26e8f29e8 100644 --- a/devices/stm32g050.yaml +++ b/devices/stm32g050.yaml @@ -3,20 +3,14 @@ _svd: ../svd/stm32g050.svd _modify: name: STM32G050 +_clear_fields: ["*"] + TIM1: _strip: - "TIM1_" -"TIM1,TIM3,TIM15": - SMCR: - _clear: - - SMS? - - TS? - TIM3: CCMR1_Output: - _clear: - - OC1M1 _modify: OC1M1: name: OC1M diff --git a/devices/stm32g051.yaml b/devices/stm32g051.yaml index 81d0c335e..a9a3bd91d 100644 --- a/devices/stm32g051.yaml +++ b/devices/stm32g051.yaml @@ -3,6 +3,8 @@ _svd: ../svd/stm32g051.svd _modify: name: STM32G051 +_clear_fields: ["*"] + TIM1: _modify: _interrupts: @@ -11,15 +13,8 @@ TIM1: _strip: - "TIM1_" -"TIM1,TIM2,TIM15": - SMCR: - _clear: - - SMS? - - TS? TIM2: CCMR1_Output: - _clear: - - OC1M1 _modify: OC1M1: name: OC1M diff --git a/devices/stm32g061.yaml b/devices/stm32g061.yaml index 1bd7b2027..5c3f987de 100644 --- a/devices/stm32g061.yaml +++ b/devices/stm32g061.yaml @@ -3,6 +3,8 @@ _svd: ../svd/stm32g061.svd _modify: name: STM32G061 +_clear_fields: ["*"] + TIM1: _modify: _interrupts: @@ -11,16 +13,8 @@ TIM1: _strip: - "TIM1_" -"TIM1,TIM2,TIM3,TIM15": - SMCR: - _clear: - - SMS? - - TS? - TIM2: CCMR1_Output: - _clear: - - OC1M? _modify: OC2M1: name: OC2M diff --git a/devices/stm32g070.yaml b/devices/stm32g070.yaml index 314458f9b..8ae76bb25 100644 --- a/devices/stm32g070.yaml +++ b/devices/stm32g070.yaml @@ -1,5 +1,7 @@ _svd: ../svd/stm32g070.svd +_clear_fields: ["*"] + _modify: name: STM32G070 @@ -134,15 +136,6 @@ _add: derivedFrom: USART1 baseAddress: "0x40004800" - - - -"TIM1,TIM2,TIM15": - SMCR: - _clear: - - SMS? - - TS? - MPU: _strip: - "MPU_" diff --git a/devices/stm32g071.yaml b/devices/stm32g071.yaml index 5bb5a3f7b..d76ad1eca 100644 --- a/devices/stm32g071.yaml +++ b/devices/stm32g071.yaml @@ -3,6 +3,8 @@ _svd: ../svd/stm32g071.svd _modify: name: STM32G071 +_clear_fields: ["*"] + _delete: - RNG @@ -45,9 +47,6 @@ TIM1: TIM15: CCMR1_Output: - _clear: - - OC1M1 - - OC1M2 _modify: OC1M1: name: OC1M @@ -58,12 +57,6 @@ TIM15: OC2M2: name: OC2M_3 -"TIM1,TIM3,TIM15": - SMCR: - _clear: - - SMS? - - TS? - MPU: _strip: - "MPU_" diff --git a/devices/stm32g0b0.yaml b/devices/stm32g0b0.yaml index add3a13df..67b2a8965 100644 --- a/devices/stm32g0b0.yaml +++ b/devices/stm32g0b0.yaml @@ -3,6 +3,8 @@ _svd: ../svd/stm32g0b0.svd _modify: name: STM32G0B0 +_clear_fields: ["*"] + TIM1: _modify: _interrupts: @@ -11,16 +13,8 @@ TIM1: _strip: - "TIM1_" -"TIM1,TIM3,TIM15": - SMCR: - _clear: - - SMS? - - TS? - TIM3: CCMR1_Output: - _clear: - - OC1M? _modify: OC1M1: name: OC1M diff --git a/devices/stm32g0b1.yaml b/devices/stm32g0b1.yaml index 9f5427e5c..6cf2e3444 100644 --- a/devices/stm32g0b1.yaml +++ b/devices/stm32g0b1.yaml @@ -3,6 +3,8 @@ _svd: ../svd/stm32g0b1.svd _modify: name: STM32G0B1 +_clear_fields: ["*"] + _delete: - DMA1 - DMA2 @@ -15,16 +17,8 @@ TIM1: _strip: - "TIM1_" -"TIM1,TIM2,TIM15": - SMCR: - _clear: - - SMS? - - TS? - "TIM1,TIM2": CCMR1_Output: - _clear: - - OC1M1 _modify: OC1M1: name: OC1M diff --git a/devices/stm32g0c1.yaml b/devices/stm32g0c1.yaml index eb08861d3..8ab680ec2 100644 --- a/devices/stm32g0c1.yaml +++ b/devices/stm32g0c1.yaml @@ -3,6 +3,8 @@ _svd: ../svd/stm32g0c1.svd _modify: name: STM32G0C1 +_clear_fields: ["*"] + _delete: - DMA1 - DMA2 @@ -10,9 +12,6 @@ _delete: AES: _strip: - "AES_" - CR: - _clear: - - CHMOD? TIM1: _modify: @@ -22,16 +21,8 @@ TIM1: _strip: - "TIM1_" -"TIM1,TIM2,TIM15": - SMCR: - _clear: - - SMS? - - TS? - "TIM1,TIM2": CCMR1_Output: - _clear: - - OC1M1 _modify: OC1M1: name: OC1M diff --git a/devices/stm32h7b3.yaml b/devices/stm32h7b3.yaml index f22489c79..f14654a39 100644 --- a/devices/stm32h7b3.yaml +++ b/devices/stm32h7b3.yaml @@ -1,5 +1,7 @@ _svd: ../svd/stm32h7b3.svd +_clear_fields: ["*"] + # Applies to the H7A3/H7B3 # CRYP and HASH are unavailable on the H7A3 @@ -63,10 +65,6 @@ RCC: _delete: - LPTIM4LPEN - LPTIM5LPEN - RSR,C1_RSR: - _clear: - - RMVF - - "*RSTF" DBGMCU: APB4FZ1: