Skip to content

clear all vendor provided enumeratedValues for g0 and h7b3 #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
34 changes: 0 additions & 34 deletions devices/common_patches/h7_common_highmemory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,6 @@ RCC:
bitWidth: 1

CR:
_clear:
"*"
_modify:
RC48ON:
name: HSI48ON
Expand All @@ -515,16 +513,12 @@ RCC:
RC48CAL:
name: HSI48CAL
CFGR:
_clear:
"*"
_modify:
MCO1SEL:
name: MCO1
MCO2SEL:
name: MCO2
CIER:
_clear:
"*"
_modify:
RC48RDYIE:
name: HSI48RDYIE
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 0 additions & 4 deletions devices/common_patches/tim/v2/g0_1.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
"TIM1,TIM15":
CCMR1_Output:
_clear:
- OC1M?
_modify:
OC2M1:
name: OC2M
Expand All @@ -27,8 +25,6 @@ TIM1:

"TIM1[46]":
CCMR1_Output:
_clear:
- OC1M?
_modify:
OC1M1:
name: OC1M
Expand Down
10 changes: 2 additions & 8 deletions devices/stm32g050.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 2 additions & 7 deletions devices/stm32g051.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ _svd: ../svd/stm32g051.svd
_modify:
name: STM32G051

_clear_fields: ["*"]

TIM1:
_modify:
_interrupts:
Expand All @@ -11,15 +13,8 @@ TIM1:
_strip:
- "TIM1_"

"TIM1,TIM2,TIM15":
SMCR:
_clear:
- SMS?
- TS?
TIM2:
CCMR1_Output:
_clear:
- OC1M1
_modify:
OC1M1:
name: OC1M
Expand Down
10 changes: 2 additions & 8 deletions devices/stm32g061.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ _svd: ../svd/stm32g061.svd
_modify:
name: STM32G061

_clear_fields: ["*"]

TIM1:
_modify:
_interrupts:
Expand All @@ -11,16 +13,8 @@ TIM1:
_strip:
- "TIM1_"

"TIM1,TIM2,TIM3,TIM15":
SMCR:
_clear:
- SMS?
- TS?

TIM2:
CCMR1_Output:
_clear:
- OC1M?
_modify:
OC2M1:
name: OC2M
Expand Down
11 changes: 2 additions & 9 deletions devices/stm32g070.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
_svd: ../svd/stm32g070.svd

_clear_fields: ["*"]

_modify:
name: STM32G070

Expand Down Expand Up @@ -134,15 +136,6 @@ _add:
derivedFrom: USART1
baseAddress: "0x40004800"




"TIM1,TIM2,TIM15":
SMCR:
_clear:
- SMS?
- TS?

MPU:
_strip:
- "MPU_"
Expand Down
11 changes: 2 additions & 9 deletions devices/stm32g071.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ _svd: ../svd/stm32g071.svd
_modify:
name: STM32G071

_clear_fields: ["*"]

_delete:
- RNG

Expand Down Expand Up @@ -45,9 +47,6 @@ TIM1:

TIM15:
CCMR1_Output:
_clear:
- OC1M1
- OC1M2
_modify:
OC1M1:
name: OC1M
Expand All @@ -58,12 +57,6 @@ TIM15:
OC2M2:
name: OC2M_3

"TIM1,TIM3,TIM15":
SMCR:
_clear:
- SMS?
- TS?

MPU:
_strip:
- "MPU_"
Expand Down
10 changes: 2 additions & 8 deletions devices/stm32g0b0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ _svd: ../svd/stm32g0b0.svd
_modify:
name: STM32G0B0

_clear_fields: ["*"]

TIM1:
_modify:
_interrupts:
Expand All @@ -11,16 +13,8 @@ TIM1:
_strip:
- "TIM1_"

"TIM1,TIM3,TIM15":
SMCR:
_clear:
- SMS?
- TS?

TIM3:
CCMR1_Output:
_clear:
- OC1M?
_modify:
OC1M1:
name: OC1M
Expand Down
10 changes: 2 additions & 8 deletions devices/stm32g0b1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ _svd: ../svd/stm32g0b1.svd
_modify:
name: STM32G0B1

_clear_fields: ["*"]

_delete:
- DMA1
- DMA2
Expand All @@ -15,16 +17,8 @@ TIM1:
_strip:
- "TIM1_"

"TIM1,TIM2,TIM15":
SMCR:
_clear:
- SMS?
- TS?

"TIM1,TIM2":
CCMR1_Output:
_clear:
- OC1M1
_modify:
OC1M1:
name: OC1M
Expand Down
13 changes: 2 additions & 11 deletions devices/stm32g0c1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ _svd: ../svd/stm32g0c1.svd
_modify:
name: STM32G0C1

_clear_fields: ["*"]

_delete:
- DMA1
- DMA2

AES:
_strip:
- "AES_"
CR:
_clear:
- CHMOD?

TIM1:
_modify:
Expand All @@ -22,16 +21,8 @@ TIM1:
_strip:
- "TIM1_"

"TIM1,TIM2,TIM15":
SMCR:
_clear:
- SMS?
- TS?

"TIM1,TIM2":
CCMR1_Output:
_clear:
- OC1M1
_modify:
OC1M1:
name: OC1M
Expand Down
6 changes: 2 additions & 4 deletions devices/stm32h7b3.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
_svd: ../svd/stm32h7b3.svd

_clear_fields: ["*"]

# Applies to the H7A3/H7B3
# CRYP and HASH are unavailable on the H7A3

Expand Down Expand Up @@ -63,10 +65,6 @@ RCC:
_delete:
- LPTIM4LPEN
- LPTIM5LPEN
RSR,C1_RSR:
_clear:
- RMVF
- "*RSTF"

DBGMCU:
APB4FZ1:
Expand Down