From ab60f8a18e21f4250addd774b14907215528104c Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Wed, 5 Feb 2025 14:50:43 +0300 Subject: [PATCH 01/13] C0+F0 --- devices/patches/c0.yaml | 45 ------------------------------------ devices/stm32c011.yaml | 41 +++++++++++++++++++++++++++++---- devices/stm32c031.yaml | 51 ++++++++++++++++++++++++++++++++++------- devices/stm32c071.yaml | 47 +++++++++++++++++++++++++++++++++---- devices/stm32f0x0.yaml | 6 +++-- devices/stm32f0x1.yaml | 12 +++++++--- devices/stm32f0x2.yaml | 10 ++++---- devices/stm32f0x8.yaml | 22 +++++++++++------- devices/stm32f100.yaml | 12 +++++++--- devices/stm32f101.yaml | 20 +++++++++++++--- devices/stm32f102.yaml | 15 +++++++++--- devices/stm32f103.yaml | 16 ++++++++++--- devices/stm32f107.yaml | 24 +++++++++++++++---- 13 files changed, 227 insertions(+), 94 deletions(-) delete mode 100644 devices/patches/c0.yaml diff --git a/devices/patches/c0.yaml b/devices/patches/c0.yaml deleted file mode 100644 index 5e67103e3..000000000 --- a/devices/patches/c0.yaml +++ /dev/null @@ -1,45 +0,0 @@ -_clear_fields: "*" - -RCC: - _strip: RCC_ - -DMA: - _strip: DMA_ - -DMAMUX: - _strip: DMAMUX_ - -CRC: - _strip: CRC_ - -RTC: - _strip: RTC_ - -EXTI: - _strip: EXTI_ - _modify: - _interrupts: - EXTI4_5: - name: EXTI4_15 - description: EXTI line 4 to 15 interrupt - -GPIO?: - _strip: GPIO?_ - -IWDG: - _strip: IWDG_ - -PWR: - _strip: PWR_ - -WWDG: - _strip: WWDG_ - -DBG: - _strip: DBG_ - -SYSCFG: - _strip: SYSCFG_ - -FLASH: - _strip: FLASH_ diff --git a/devices/stm32c011.yaml b/devices/stm32c011.yaml index df0a5d3e7..ef5e75f05 100644 --- a/devices/stm32c011.yaml +++ b/devices/stm32c011.yaml @@ -1,5 +1,7 @@ _svd: ../svd/stm32c011.svd +_clear_fields: "*" + _modify: name: STM32C011 @@ -9,11 +11,33 @@ ADC: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml +CRC: + _strip: CRC_ + +DBG: + _strip: DBG_ + +DMA: + _strip: DMA_ + DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml +EXTI: + _strip: EXTI_ + _modify: + _interrupts: + EXTI4_5: + name: EXTI4_15 + description: EXTI line 4 to 15 interrupt + +FLASH: + _strip: FLASH_ + GPIO?: + _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -23,25 +47,34 @@ GPIO[A]: GPIO[BCDF]: _include: collect/gpio/v2r_derive.yaml -I2C?: +I2C1: _strip: I2C_ IWDG: + _strip: IWDG_ _include: patches/16bit_with_mask.yaml +PWR: + _strip: PWR_ + +RCC: + _strip: RCC_ + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml #- fields/rtc/v3.yaml #- collect/rtc/alarm.yaml SPI1: + _strip: SPI?_ _include: - patches/16bit.yaml - patches/spi/dr8.yaml -SPI?: - _strip: SPI?_ +SYSCFG: + _strip: SYSCFG_ TIM1: _strip: TIM1_ @@ -91,8 +124,8 @@ USART1: - fields/usart/v4/B.yaml WWDG: + _strip: WWDG_ _include: patches/16bit_with_mask.yaml _include: - - patches/c0.yaml - patches/nvic/2_prio_bits.yaml diff --git a/devices/stm32c031.yaml b/devices/stm32c031.yaml index 92b7c493e..497d2d59d 100644 --- a/devices/stm32c031.yaml +++ b/devices/stm32c031.yaml @@ -1,5 +1,7 @@ _svd: ../svd/stm32c031.svd +_clear_fields: "*" + _modify: name: STM32C031 SPI: @@ -13,11 +15,33 @@ ADC: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml +CRC: + _strip: CRC_ + +DBG: + _strip: DBG_ + +DMA: + _strip: DMA_ + DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml +EXTI: + _strip: EXTI_ + _modify: + _interrupts: + EXTI4_5: + name: EXTI4_15 + description: EXTI line 4 to 15 interrupt + +FLASH: + _strip: FLASH_ + GPIO?: + _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -27,18 +51,35 @@ GPIO[A]: GPIO[BCDF]: _include: collect/gpio/v2r_derive.yaml -I2C?: +I2C1: _strip: I2C_ IWDG: + _strip: IWDG_ _include: patches/16bit_with_mask.yaml +PWR: + _strip: PWR_ + +RCC: + _strip: RCC_ + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml #- fields/rtc/v3.yaml #- collect/rtc/alarm.yaml +SPI1: + _strip: SPI_ + _include: + - patches/16bit.yaml + - patches/spi/dr8.yaml + +SYSCFG: + _strip: SYSCFG_ + TIM1: _strip: TIM1_ _include: @@ -80,12 +121,6 @@ TIM1[67]: - fields/tim/v2/tim16.yaml - collect/tim/ccr.yaml -SPI1: - _include: - - patches/16bit.yaml - - patches/spi/dr8.yaml - _strip: SPI_ - USART1: _strip: USART_ _include: @@ -93,8 +128,8 @@ USART1: - fields/usart/v4/B.yaml WWDG: + _strip: WWDG_ _include: patches/16bit_with_mask.yaml _include: - - patches/c0.yaml - patches/nvic/2_prio_bits.yaml diff --git a/devices/stm32c071.yaml b/devices/stm32c071.yaml index e6f736343..7e173dc22 100644 --- a/devices/stm32c071.yaml +++ b/devices/stm32c071.yaml @@ -1,5 +1,7 @@ _svd: ../svd/stm32c071.svd +_clear_fields: "*" + _modify: name: STM32C071 TIM*: @@ -19,14 +21,36 @@ ADC: name: CHSELR1 alternateRegister: CHSELR0 +CRC: + _strip: CRC_ + CRS: _strip: CRS_ +DBG: + _strip: DBG_ + +DMA: + _strip: DMA_ + DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml +EXTI: + _strip: EXTI_ + _modify: + _interrupts: + EXTI4_5: + name: EXTI4_15 + description: EXTI line 4 to 15 interrupt + +FLASH: + _strip: FLASH_ + GPIO?: + _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -36,22 +60,34 @@ GPIO[A]: GPIO[BCDF]: _include: collect/gpio/v2r_derive.yaml -I2C?: +I2C1: _strip: I2C_ +IWDG: + _strip: IWDG_ + _include: patches/16bit_with_mask.yaml + +PWR: + _strip: PWR_ + +RCC: + _strip: RCC_ + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml #- fields/rtc/v3.yaml #- collect/rtc/alarm.yaml SPI1: + _strip: SPI?_ _include: - patches/16bit.yaml - patches/spi/dr8.yaml -SPI?: - _strip: SPI?_ +SYSCFG: + _strip: SYSCFG_ TIM[123]: _strip: TIM?_ @@ -131,6 +167,9 @@ USB: _include: - collect/usb/chepr.yaml +WWDG: + _strip: WWDG_ + _include: patches/16bit_with_mask.yaml + _include: - - patches/c0.yaml - patches/nvic/2_prio_bits.yaml diff --git a/devices/stm32f0x0.yaml b/devices/stm32f0x0.yaml index 041116cd0..7d7729ecf 100644 --- a/devices/stm32f0x0.yaml +++ b/devices/stm32f0x0.yaml @@ -22,7 +22,9 @@ CRC: - fields/crc/crc_advanced.yaml - fields/crc/crc_idr_8bit.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -49,7 +51,7 @@ GPIO[A]: GPIO[F]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - patches/i2c/merge_OAR1_OA1x_fields.yaml diff --git a/devices/stm32f0x1.yaml b/devices/stm32f0x1.yaml index 8294865ae..c9a761ac8 100644 --- a/devices/stm32f0x1.yaml +++ b/devices/stm32f0x1.yaml @@ -24,6 +24,8 @@ CEC: - patches/cec/cfgr.yaml - fields/hdmi_cec.yaml +COMP: {} + CRC: _include: - patches/crc/f0_init_addr_fix.yaml @@ -32,13 +34,17 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - fields/dac/dac_common_2ch.yaml - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -66,7 +72,7 @@ GPIO[A]: GPIO[F]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - patches/i2c/merge_OAR1_OA1x_fields.yaml @@ -103,7 +109,7 @@ RTC: #- collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f0x2.yaml b/devices/stm32f0x2.yaml index 22a2aca9e..1e5b68c1c 100644 --- a/devices/stm32f0x2.yaml +++ b/devices/stm32f0x2.yaml @@ -32,12 +32,16 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - fields/dac/dac_common_2ch.yaml - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml +DBGMCU: {} + DMA1: _add: _interrupts: @@ -48,8 +52,6 @@ DMA1: DMA1_CH4_5_6_7: description: "DMA channel 4, 5, 6 and 7 interrupts" value: 11 - -DMA?: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -72,7 +74,7 @@ GPIO[A]: GPIO[F]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - patches/i2c/merge_OAR1_OA1x_fields.yaml @@ -120,7 +122,7 @@ RTC: #- collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f0x8.yaml b/devices/stm32f0x8.yaml index 08d1a1a73..f4cb912cc 100644 --- a/devices/stm32f0x8.yaml +++ b/devices/stm32f0x8.yaml @@ -12,11 +12,6 @@ ADC: - fields/adc/adc_aditf4_v1_1_RM0091.yaml - collect/adc/f0_l0.yaml -CEC: - _include: - - patches/cec/cfgr.yaml - - fields/hdmi_cec.yaml - CAN: _strip: CAN_ _include: @@ -24,6 +19,13 @@ CAN: - collect/can/can.yaml - collect/can/filter_bank.yaml +CEC: + _include: + - patches/cec/cfgr.yaml + - fields/hdmi_cec.yaml + +COMP: {} + CRC: _include: - patches/crc/f0_init_addr_fix.yaml @@ -32,13 +34,17 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - fields/dac/dac_common_2ch.yaml - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -61,7 +67,7 @@ GPIO[A]: GPIO[F]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - patches/i2c/merge_OAR1_OA1x_fields.yaml @@ -98,7 +104,7 @@ RTC: #- collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f100.yaml b/devices/stm32f100.yaml index f09fe437a..de371660d 100644 --- a/devices/stm32f100.yaml +++ b/devices/stm32f100.yaml @@ -19,6 +19,8 @@ BKP: - fields/bkp/bkp.yaml - collect/bkp/dr.yaml +CEC: {} + CRC: _include: - fields/crc/crc_basic.yaml @@ -30,7 +32,9 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -40,6 +44,8 @@ EXTI: - fields/exti/common.yaml - collect/exti/farray.yaml +FLASH: {} + FSMC: _include: - patches/fsmc/fsmc_sramfix_v3.yaml @@ -52,7 +58,7 @@ GPIOA: - collect/gpio/f1.yaml - collect/gpio/f1_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -82,7 +88,7 @@ RTC: _include: - fields/rtc/rtc_f1.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f101.yaml b/devices/stm32f101.yaml index 79bb11367..9326b779b 100644 --- a/devices/stm32f101.yaml +++ b/devices/stm32f101.yaml @@ -62,11 +62,18 @@ DAC: - fields/dac/dac_common_2ch.yaml - fields/dac/dac_wavegen.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml +Ethernet_DMA: {} +Ethernet_MAC: {} +Ethernet_MMC: {} +Ethernet_PTP: {} + EXTI: _include: - fields/exti/common.yaml @@ -88,7 +95,7 @@ GPIOA: - collect/gpio/f1.yaml - collect/gpio/f1_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -104,6 +111,11 @@ IWDG: MPU: _strip: MPU_ +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + PWR: _include: - fields/pwr/pwr_v1.yaml @@ -119,7 +131,9 @@ RTC: _include: - fields/rtc/rtc_f1.yaml -SPI?: +SDIO: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f102.yaml b/devices/stm32f102.yaml index 4916ddd1a..65e62f8de 100644 --- a/devices/stm32f102.yaml +++ b/devices/stm32f102.yaml @@ -66,7 +66,9 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -92,7 +94,7 @@ GPIOA: - collect/gpio/f1.yaml - collect/gpio/f1_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -108,6 +110,11 @@ IWDG: MPU: _strip: MPU_ +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + PWR: _include: - fields/pwr/pwr_v1.yaml @@ -164,7 +171,9 @@ RTC: _include: - fields/rtc/rtc_f1.yaml -SPI?: +SDIO: {} + +SPI[12]: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f103.yaml b/devices/stm32f103.yaml index 610258b9a..22c15b64f 100644 --- a/devices/stm32f103.yaml +++ b/devices/stm32f103.yaml @@ -83,11 +83,16 @@ DBGMCU: description: DBG_CAN_STOP _delete: DBG_CAN2_STOP -DMA?: +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml +Ethernet_DMA: {} +Ethernet_MAC: {} +Ethernet_MMC: {} +Ethernet_PTP: {} + EXTI: _include: - fields/exti/common.yaml @@ -109,7 +114,7 @@ GPIOA: - collect/gpio/f1.yaml - collect/gpio/f1_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -125,6 +130,11 @@ IWDG: MPU: _strip: MPU_ +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + PWR: _include: - fields/pwr/pwr_v1.yaml @@ -152,7 +162,7 @@ SDIO: _include: - collect/sdio/resp.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f107.yaml b/devices/stm32f107.yaml index 118740f81..4446da9f9 100644 --- a/devices/stm32f107.yaml +++ b/devices/stm32f107.yaml @@ -50,7 +50,7 @@ BKP: - fields/bkp/bkp.yaml - collect/bkp/dr.yaml -CAN?: +CAN1: _strip: CAN_ _include: - fields/can/can.yaml @@ -67,17 +67,24 @@ DAC: - fields/dac/dac_common_2ch.yaml - fields/dac/dac_wavegen.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml +#Ethernet_DMA: {} + Ethernet_MAC: MACA2LR: _modify: MACA2L: bitWidth: 32 +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - fields/exti/common.yaml @@ -87,13 +94,15 @@ FLASH: _include: - fields/flash/flash_f1.yaml +FSMC: {} + GPIOA: _include: - fields/gpio/v1/common.yaml - collect/gpio/f1.yaml - collect/gpio/f1_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -109,6 +118,11 @@ IWDG: MPU: _strip: MPU_ +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + PWR: _include: - fields/pwr/pwr_v1.yaml @@ -124,7 +138,9 @@ RTC: _include: - fields/rtc/rtc_f1.yaml -SPI?: +SDIO: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml From fc6b6406c887b18f770a4128b85c88330a620de3 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Wed, 5 Feb 2025 21:44:26 +0300 Subject: [PATCH 02/13] F4 --- devices/stm32f215.yaml | 35 ++++++++++-- devices/stm32f217.yaml | 35 ++++++++++-- devices/stm32f301.yaml | 41 +++++++------ devices/stm32f302.yaml | 20 +++++-- devices/stm32f303.yaml | 18 ++++-- devices/stm32f373.yaml | 16 ++++-- devices/stm32f3x4.yaml | 16 ++++-- devices/stm32f401.yaml | 15 +++-- devices/stm32f405.yaml | 29 +++++++--- devices/stm32f407.yaml | 28 +++++++-- devices/stm32f410.yaml | 16 ++++-- devices/stm32f411.yaml | 15 +++-- devices/stm32f412.yaml | 32 ++++++----- devices/stm32f413.yaml | 127 ++++++++++++++++++++++------------------- devices/stm32f427.yaml | 31 ++++++++-- devices/stm32f429.yaml | 31 ++++++++-- devices/stm32f446.yaml | 70 ++++++++++++++--------- devices/stm32f469.yaml | 43 ++++++++++---- devices/stm32l412.yaml | 2 +- 19 files changed, 421 insertions(+), 199 deletions(-) diff --git a/devices/stm32f215.yaml b/devices/stm32f215.yaml index bb51c2b7e..da228b08e 100644 --- a/devices/stm32f215.yaml +++ b/devices/stm32f215.yaml @@ -19,7 +19,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_c.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN2: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -41,13 +41,22 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml - collect/dma/st.yaml +#Ethernet_DMA: {} +#Ethernet_MAC: {} +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - fields/exti/common.yaml @@ -79,7 +88,7 @@ FSMC: - collect/fsmc/sram.yaml - collect/fsmc/nand_v1.yaml -GPIO?: +GPIO[ABI]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -93,7 +102,7 @@ HASH: _include: - collect/hash/v1.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -109,6 +118,16 @@ IWDG: MPU: _strip: MPU_ +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} + PWR: _include: - fields/pwr/pwr_v1.yaml @@ -128,6 +147,8 @@ RCC: - fields/rcc/v2/i2s.yaml - fields/rcc/v2/i2s_pll.yaml +RNG: {} + RTC: _derive: TSTR: TR @@ -138,12 +159,16 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SDIO: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml - fields/spi/spi_v1.yaml +SYSCFG: {} + TIM1: _include: - patches/tim/icpsc.yaml diff --git a/devices/stm32f217.yaml b/devices/stm32f217.yaml index 7b518f5ac..2e00b3e77 100644 --- a/devices/stm32f217.yaml +++ b/devices/stm32f217.yaml @@ -19,7 +19,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_c.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN2: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -41,13 +41,22 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml - collect/dma/st.yaml +#Ethernet_DMA: {} +#Ethernet_MAC: {} +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - fields/exti/common.yaml @@ -79,7 +88,7 @@ FSMC: - collect/fsmc/sram.yaml - collect/fsmc/nand_v1.yaml -GPIO?: +GPIO[ABI]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -93,7 +102,7 @@ HASH: _include: - collect/hash/v1.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -109,6 +118,16 @@ IWDG: MPU: _strip: MPU_ +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} + PWR: _include: - fields/pwr/pwr_v1.yaml @@ -128,6 +147,8 @@ RCC: - fields/rcc/v2/i2s.yaml - fields/rcc/v2/i2s_pll.yaml +RNG: {} + RTC: _derive: TSTR: TR @@ -138,12 +159,16 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SDIO: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml - fields/spi/spi_v1.yaml +SYSCFG: {} + TIM1: _include: - patches/tim/icpsc.yaml diff --git a/devices/stm32f301.yaml b/devices/stm32f301.yaml index 3533f311b..ce3c64b5b 100644 --- a/devices/stm32f301.yaml +++ b/devices/stm32f301.yaml @@ -32,8 +32,6 @@ ADC1_2: - DELAY - DUAL - MULT - -ADC*_*: _include: - fields/adc/adc_v3_common_single.yaml - fields/adc/adc_v3_common_f3_single.yaml @@ -55,6 +53,8 @@ ADC1: SQR?: SQ*: [1, 18] +COMP: {} + CRC: _include: - fields/crc/crc_advanced.yaml @@ -66,7 +66,9 @@ DAC1: - fields/dac/dac_common_1ch.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -90,7 +92,7 @@ FLASH: - fields/flash/flash_f3_common.yaml - fields/flash/acr/hlfcya.yaml -GPIO?: +GPIO[ABC]: _include: - fields/gpio/v2/f3.yaml - collect/gpio/v2.yaml @@ -100,7 +102,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - patches/i2c/merge_OAR1_OA1x_fields.yaml @@ -111,6 +113,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +OPAMP: {} + PWR: _add: _interrupts: @@ -118,22 +122,6 @@ PWR: description: PVD through EXTI line detection interrupt value: 1 -SPI?: - _include: - - patches/16bit.yaml - - patches/spi/dr8.yaml - - fields/spi/spi_v2.yaml - SR: - _modify: - # This field has the wrong name in the SVD compared to RM0366 - TIFRFE: - name: FRE - -I2S*: - _include: - - fields/spi/spi_v2_i2s.yaml - - fields/spi/spi_SR_UDR_CHSIDE.yaml - RCC: CFGR3: _modify: @@ -156,6 +144,17 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml +SPI2: + _include: + - patches/16bit.yaml + - patches/spi/dr8.yaml + - fields/spi/spi_v2.yaml + SR: + _modify: + # This field has the wrong name in the SVD compared to RM0366 + TIFRFE: + name: FRE + SYSCFG: _delete: - SYSCFG_RCR diff --git a/devices/stm32f302.yaml b/devices/stm32f302.yaml index 75992a0e4..737592ebf 100644 --- a/devices/stm32f302.yaml +++ b/devices/stm32f302.yaml @@ -47,6 +47,8 @@ CAN: - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: _include: - fields/crc/crc_advanced.yaml @@ -59,7 +61,9 @@ DAC1: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -78,7 +82,9 @@ FLASH: - fields/flash/acr/hlfcya.yaml - fields/flash/flash_f3_obr_sram_parity_check.yaml -GPIO?: +FMC: {} + +GPIO[ABC]: _include: - fields/gpio/v2/f3.yaml - collect/gpio/v2.yaml @@ -88,7 +94,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - patches/i2c/merge_OAR1_OA1x_fields.yaml @@ -99,6 +105,10 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +OPAMP: {} + +PWR: {} + RCC: APB1RSTR: _delete: @@ -176,7 +186,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -187,7 +197,7 @@ SPI?: TIFRFE: name: FRE -I2S*: +I2S2ext: _include: - fields/spi/spi_v2_i2s.yaml - fields/spi/spi_SR_UDR_CHSIDE.yaml diff --git a/devices/stm32f303.yaml b/devices/stm32f303.yaml index 00b6fd070..b024bd102 100644 --- a/devices/stm32f303.yaml +++ b/devices/stm32f303.yaml @@ -48,6 +48,8 @@ CAN: - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: _include: - fields/crc/crc_advanced.yaml @@ -60,7 +62,9 @@ DAC1: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -79,7 +83,9 @@ FLASH: - fields/flash/acr/hlfcya.yaml - fields/flash/flash_f3_obr_sram_parity_check.yaml -GPIO?: +FMC: {} + +GPIO[ABC]: _include: - fields/gpio/v2/f3.yaml - collect/gpio/v2.yaml @@ -89,7 +95,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - patches/i2c/merge_OAR1_OA1x_fields.yaml @@ -100,6 +106,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +OPAMP: {} + PWR: CSR: _add: @@ -150,7 +158,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -161,7 +169,7 @@ SPI?: TIFRFE: name: FRE -I2S*: +I2S2ext: _include: - fields/spi/spi_v2_i2s.yaml - fields/spi/spi_SR_UDR_CHSIDE.yaml diff --git a/devices/stm32f373.yaml b/devices/stm32f373.yaml index 61388857d..3d9bef868 100644 --- a/devices/stm32f373.yaml +++ b/devices/stm32f373.yaml @@ -80,7 +80,11 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml -DMA?: +DAC[12]: {} + +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -139,7 +143,7 @@ GPIOD: PUPDR: resetValue: "0x00000000" -GPIO?: +GPIO[ABCD]: _include: - fields/gpio/v2/f3.yaml - collect/gpio/v2.yaml @@ -149,7 +153,7 @@ GPIO[A]: GPIO[BCD]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - patches/i2c/merge_OAR1_OA1x_fields.yaml @@ -160,6 +164,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +PWR: {} + RCC: APB2RSTR: _modify: @@ -195,7 +201,9 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SDADC1: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f3x4.yaml b/devices/stm32f3x4.yaml index eb4881a22..a0d841aa7 100644 --- a/devices/stm32f3x4.yaml +++ b/devices/stm32f3x4.yaml @@ -43,19 +43,23 @@ CAN: - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: _include: - fields/crc/crc_advanced.yaml - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml -DAC?: +DAC1: _include: - fields/dac/dac_common_2ch.yaml - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml @@ -73,7 +77,7 @@ FLASH: - fields/flash/acr/hlfcya.yaml - fields/flash/flash_f3_common.yaml -GPIO?: +GPIO[ABC]: _include: - fields/gpio/v2/f3.yaml - collect/gpio/v2.yaml @@ -83,7 +87,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - patches/i2c/merge_OAR1_OA1x_fields.yaml @@ -94,6 +98,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +OPAMP: {} + PWR: _include: - fields/pwr/pwr_v1.yaml @@ -186,7 +192,7 @@ SPI2: name: CRCL description: CRC length -SPI?: +SPI[12]: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f401.yaml b/devices/stm32f401.yaml index f1cb27df1..048a31b4f 100644 --- a/devices/stm32f401.yaml +++ b/devices/stm32f401.yaml @@ -36,7 +36,9 @@ CRC: - fields/crc/crc_basic.yaml - fields/crc/crc_idr_8bit.yaml -DMA?: +DBGMCU: {} + +DMA2: _include: - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml @@ -75,7 +77,7 @@ GPIOC: _interrupts: - TIM1_UP_TIM10 -GPIO?: +GPIO[ABH]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -85,7 +87,7 @@ GPIO[A]: GPIO[BH]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - patches/i2c/v1_fltr.yaml @@ -99,6 +101,11 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + PWR: CR: _add: @@ -143,7 +150,7 @@ SDIO: - fields/sdio/sdio_f4.yaml - collect/sdio/resp.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f405.yaml b/devices/stm32f405.yaml index 4793a86c6..4ba5b2918 100644 --- a/devices/stm32f405.yaml +++ b/devices/stm32f405.yaml @@ -32,7 +32,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_c.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -59,7 +59,11 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml @@ -105,7 +109,7 @@ FSMC: - collect/fsmc/sram.yaml - collect/fsmc/nand_v1.yaml -GPIO?: +GPIO[ABI]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -119,7 +123,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -132,6 +136,15 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} + PWR: CR: _add: @@ -176,6 +189,9 @@ RCC: - fields/rcc/v2/i2s.yaml - fields/rcc/v2/i2s_pll.yaml +RNG: + _include: fields/rng/rng_f4.yaml + RTC: _include: - patches/rtc/alarm.yaml @@ -185,15 +201,12 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -RNG: - _include: fields/rng/rng_f4.yaml - SDIO: _include: - fields/sdio/sdio_f4.yaml - collect/sdio/resp.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f407.yaml b/devices/stm32f407.yaml index 291e6fdf5..36ffe9020 100644 --- a/devices/stm32f407.yaml +++ b/devices/stm32f407.yaml @@ -25,7 +25,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_c.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -52,7 +52,11 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml @@ -65,6 +69,11 @@ EXTI: - fields/exti/common.yaml - collect/exti/farray.yaml +#Ethernet_DMA: {} +#Ethernet_MAC: {} +#Ethernet_MMC: {} +#Ethernet_PTP: {} + FLASH: _include: - patches/flash/optcr/nwrp.yaml @@ -98,7 +107,7 @@ FSMC: - collect/fsmc/sram.yaml - collect/fsmc/nand_v1.yaml -GPIO?: +GPIO[ABI]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -112,7 +121,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -125,6 +134,15 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} + PWR: CR: _add: @@ -168,7 +186,7 @@ SDIO: - fields/sdio/sdio_f4.yaml - collect/sdio/resp.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f410.yaml b/devices/stm32f410.yaml index 8af3cca9e..9204fe982 100644 --- a/devices/stm32f410.yaml +++ b/devices/stm32f410.yaml @@ -57,7 +57,9 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml @@ -98,11 +100,11 @@ FLASH: - fields/flash/sr/rderr.yaml - collect/flash/optcr/nwrp.yaml -FMPI2C?: +FMPI2C1: _include: - fields/i2c/v2.yaml -GPIO?: +GPIO[ABH]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -112,7 +114,7 @@ GPIO[A]: GPIO[BH]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - patches/i2c/v1_fltr.yaml @@ -126,6 +128,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg.yaml +LPTIM1: {} + PWR: _include: - patches/pwr/f4.yaml @@ -192,7 +196,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -202,6 +206,8 @@ SPI?: # This field has the wrong name in the SVD compared to RM0401 TIFRFE: name: FRE + +SPI5: _add: _interrupts: SPI5: diff --git a/devices/stm32f411.yaml b/devices/stm32f411.yaml index 6a1689e17..33d0faa07 100644 --- a/devices/stm32f411.yaml +++ b/devices/stm32f411.yaml @@ -36,7 +36,9 @@ CRC: - fields/crc/crc_basic.yaml - fields/crc/crc_idr_8bit.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml @@ -70,7 +72,7 @@ FLASH: - fields/flash/sr/rderr.yaml - collect/flash/optcr/nwrp.yaml -GPIO?: +GPIO[ABH]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -80,7 +82,7 @@ GPIO[A]: GPIO[BH]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - patches/i2c/v1_fltr.yaml @@ -94,6 +96,11 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + PWR: _include: - patches/pwr/f4.yaml @@ -140,7 +147,7 @@ SDIO: - fields/sdio/sdio_f4.yaml - collect/sdio/resp.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f412.yaml b/devices/stm32f412.yaml index 6b228c5c0..e3d55d3e5 100644 --- a/devices/stm32f412.yaml +++ b/devices/stm32f412.yaml @@ -39,7 +39,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_c.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -55,12 +55,14 @@ CRC: - fields/crc/crc_basic.yaml - fields/crc/crc_idr_8bit.yaml +DBGMCU: {} + DFSDM: _include: - patches/dfsdm/dfsdm_v2.yaml - collect/dfsdm/v2.yaml -DMA?: +DMA2: _include: - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml @@ -164,7 +166,7 @@ FSMC: - fields/fsmc/fsmc_sram.yaml - collect/fsmc/sram.yaml -GPIO?: +GPIO[ABH]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -174,7 +176,7 @@ GPIO[A]: GPIO[BH]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - patches/i2c/v1_fltr.yaml @@ -193,6 +195,18 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + +PWR: + _include: + - patches/pwr/f4.yaml + - patches/pwr/add_sleep.yaml + - patches/pwr/add_ewup.yaml + - fields/pwr/pwr_f410_f412_f413_f423.yaml + QUADSPI: _modify: _interrupts: @@ -202,13 +216,6 @@ QUADSPI: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _include: - - patches/pwr/f4.yaml - - patches/pwr/add_sleep.yaml - - patches/pwr/add_ewup.yaml - - fields/pwr/pwr_f410_f412_f413_f423.yaml - # Add missing reset bit for SPI 4 (enable bits are present) RCC: APB1RSTR: @@ -264,7 +271,7 @@ SDIO: - fields/sdio/sdio_f4.yaml - collect/sdio/resp.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -357,7 +364,6 @@ WWDG: # NOTE: Core peripherals (NVIC, MPU, FPU, SCB, etc.) were deleted _include: - - patches/i2c/f4_fmpi2c.yaml - patches/adc/adc_common_group_name.yaml - patches/tim/group.yaml - patches/usb_otg/fs_remove_prefix.yaml diff --git a/devices/stm32f413.yaml b/devices/stm32f413.yaml index d73c11ba3..ae18288ab 100644 --- a/devices/stm32f413.yaml +++ b/devices/stm32f413.yaml @@ -83,7 +83,7 @@ AES: - patches/aes/l4.yaml - fields/aes/v2.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -105,16 +105,24 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DFSDM[12]: +DBGMCU: {} + +DFSDM2: _include: - patches/dfsdm/dfsdm_v1.yaml - collect/dfsdm/v1.yaml -DMA?: +DMA1: _include: - fields/dma/dma_v21.yaml - collect/dma/st.yaml +EXTI: + _include: + - patches/exti/add_fpu_interrupt.yaml + - fields/exti/common.yaml + - collect/exti/farray.yaml + FLASH: _include: - patches/flash/acr/latency_16_states.yaml @@ -154,13 +162,7 @@ FSMC: - fields/fsmc/fsmc_sram.yaml - collect/fsmc/sram.yaml -EXTI: - _include: - - patches/exti/add_fpu_interrupt.yaml - - fields/exti/common.yaml - - collect/exti/farray.yaml - -GPIO?: +GPIO[ABF]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -170,7 +172,7 @@ GPIO[A]: GPIO[BF]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -183,26 +185,37 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg.yaml +LPTIM: {} + +OTG_FS_*: + _strip: FS_ + +OTG_FS_DEVICE: + _delete: + _interrupts: + - USART10 + # Fix invalid formatting on this alternateRegister field -OTG_FS_GLOBAL*: - _modify: - FS_GNPTXFSIZ_Host: - alternateRegister: GNPTXFSIZ_Device +OTG_FS_GLOBAL: _add: _interrupts: OTG_FS: description: USB OTG FS Interrupt value: 67 -OTG_FS_PWRCLK*: +OTG_FS_HOST: {} + +OTG_FS_PWRCLK: _delete: _interrupts: - USART9 -OTG_FS_DEVICE*: - _delete: - _interrupts: - - USART10 +PWR: + _include: + - patches/pwr/f4.yaml + - patches/pwr/add_sleep.yaml + - patches/pwr/add_ewup.yaml + - fields/pwr/pwr_f410_f412_f413_f423.yaml QUADSPI: _add: @@ -214,13 +227,6 @@ QUADSPI: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _include: - - patches/pwr/f4.yaml - - patches/pwr/add_sleep.yaml - - patches/pwr/add_ewup.yaml - - fields/pwr/pwr_f410_f412_f413_f423.yaml - # Add missing RCC reset/enable bits RCC: APB1RSTR: @@ -335,6 +341,8 @@ RCC: - fields/rcc/v2/dckcfgr2_i2csel.yaml - fields/rcc/v2/ckgatenr.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -354,7 +362,7 @@ SDIO: - fields/sdio/sdio_f4.yaml - collect/sdio/resp.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -521,37 +529,6 @@ TIM1[01]: - fields/tim/v1/tim10.yaml - collect/tim/ccr.yaml -# The USART peripheral definitions in the svd have a random array of unrelated -# incorrect interrupt definitions. -USART1: - _add: - _interrupts: - USART1: - description: USART 1 global interrupt - value: 37 - _delete: - _interrupts: - - USART7 - _include: - - fields/usart/v2/usart.yaml - -USART2: - _add: - _interrupts: - USART2: - description: USART 2 global interrupt - value: 38 - _delete: - _interrupts: - - USART3 - -USART3: - _add: - _interrupts: - USART3: - description: USART 3 global interrupt - value: 39 - UART4: _include: - patches/usart/f4_add_UART_GTPR.yaml @@ -584,6 +561,37 @@ UART10: _interrupts: - UART5 +# The USART peripheral definitions in the svd have a random array of unrelated +# incorrect interrupt definitions. +USART1: + _add: + _interrupts: + USART1: + description: USART 1 global interrupt + value: 37 + _delete: + _interrupts: + - USART7 + _include: + - fields/usart/v2/usart.yaml + +USART2: + _add: + _interrupts: + USART2: + description: USART 2 global interrupt + value: 38 + _delete: + _interrupts: + - USART3 + +USART3: + _add: + _interrupts: + USART3: + description: USART 3 global interrupt + value: 39 + WWDG: _include: - patches/16bit.yaml @@ -594,7 +602,6 @@ WWDG: _include: - patches/adc/adc_common_group_name.yaml - patches/tim/group.yaml - - patches/usb_otg/fs_remove_prefix.yaml - patches/usb_otg/fs_v1ext.yaml - patches/usb_otg/fs_v1.yaml - collect/usb_otg/fs.yaml diff --git a/devices/stm32f427.yaml b/devices/stm32f427.yaml index 12a76c1f1..c89e56038 100644 --- a/devices/stm32f427.yaml +++ b/devices/stm32f427.yaml @@ -29,7 +29,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_c.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -56,7 +56,11 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml @@ -66,6 +70,11 @@ DMA?: DMA2D: _strip: DMA2D_ +#Ethernet_DMA: {} +#Ethernet_MAC: {} +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -138,7 +147,7 @@ FSMC: - collect/fsmc/nand_v1.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABI]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -152,7 +161,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -165,6 +174,16 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} + PWR: CR: _modify: @@ -222,7 +241,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml @@ -233,7 +252,7 @@ SDIO: - fields/sdio/sdio_f4.yaml - collect/sdio/resp.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f429.yaml b/devices/stm32f429.yaml index b980ff39a..da7e8ee1e 100644 --- a/devices/stm32f429.yaml +++ b/devices/stm32f429.yaml @@ -27,7 +27,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_c.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -54,13 +54,24 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml - collect/dma/st.yaml +DMA2D: {} + +#Ethernet_DMA: {} +#Ethernet_MAC: {} +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -121,7 +132,7 @@ FMC: - collect/fsmc/nand_v1.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABK]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -135,7 +146,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -154,6 +165,16 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} + PWR: CR: _add: @@ -224,7 +245,7 @@ SDIO: - fields/sdio/sdio_f4.yaml - collect/sdio/resp.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f446.yaml b/devices/stm32f446.yaml index db959821e..298952284 100644 --- a/devices/stm32f446.yaml +++ b/devices/stm32f446.yaml @@ -45,7 +45,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_c.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -67,13 +67,23 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml - collect/dma/st.yaml +EXTI: + _include: + - patches/exti/add_fpu_interrupt.yaml + - fields/exti/common.yaml + - collect/exti/farray.yaml + FLASH: _include: - patches/flash/acr/latency_16_states.yaml @@ -136,13 +146,7 @@ FMPI2C1: _include: - fields/i2c/v2.yaml -EXTI: - _include: - - patches/exti/add_fpu_interrupt.yaml - - fields/exti/common.yaml - - collect/exti/farray.yaml - -GPIO?: +GPIO[ABH]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -152,7 +156,9 @@ GPIO[A]: GPIO[BH]: _include: collect/gpio/v2_derive.yaml -I2C?: +HDMI_CEC: {} + +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -165,13 +171,18 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: CR: @@ -196,6 +207,11 @@ PWR: - patches/pwr/f4.yaml - fields/pwr/pwr_f446.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + # Fix misnamed RCC enable bits, add PLLSAI clock RCC: CR: @@ -264,7 +280,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml @@ -275,6 +291,19 @@ SDIO: - fields/sdio/sdio_f4_common.yaml - collect/sdio/resp.yaml +SPDIFRX: {} + +SPI1: + _include: + - patches/16bit.yaml + - patches/spi/dr8.yaml + - fields/spi/spi_v1.yaml + SR: + _modify: + # This field has the wrong name in the SVD compared to RM0390 + TIFRFE: + name: FRE + SYSCFG: _include: - patches/syscfg/f4_common.yaml @@ -304,17 +333,6 @@ SYSCFG: _delete: - MII_RMII_SEL -SPI?: - _include: - - patches/16bit.yaml - - patches/spi/dr8.yaml - - fields/spi/spi_v1.yaml - SR: - _modify: - # This field has the wrong name in the SVD compared to RM0390 - TIFRFE: - name: FRE - TIM1: _include: - patches/tim/icpsc.yaml diff --git a/devices/stm32f469.yaml b/devices/stm32f469.yaml index 638794700..e4bd943c8 100644 --- a/devices/stm32f469.yaml +++ b/devices/stm32f469.yaml @@ -46,7 +46,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_c.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -73,17 +73,21 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml +DBGMCU: {} -DMA?: +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml - collect/dma/st.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + DSI: _add: _interrupts: @@ -100,6 +104,11 @@ EXTI: - fields/exti/common.yaml - collect/exti/farray.yaml +#Ethernet_DMA: {} +#Ethernet_MAC: {} +#Ethernet_MMC: {} +#Ethernet_PTP: {} + FLASH: _include: - patches/flash/acr/latency_16_states.yaml @@ -136,7 +145,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABK]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -150,7 +159,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -169,13 +178,18 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: CR: @@ -187,6 +201,11 @@ PWR: - patches/pwr/f4.yaml - fields/pwr/pwr_f469_f479.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + # Fix misnamed RCC enable bits RCC: APB1RSTR: @@ -264,7 +283,7 @@ SDIO: - fields/sdio/sdio_f4.yaml - collect/sdio/resp.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32l412.yaml b/devices/stm32l412.yaml index b563127fc..eec9b156b 100644 --- a/devices/stm32l412.yaml +++ b/devices/stm32l412.yaml @@ -208,7 +208,7 @@ TSC: _include: - collect/tsc/iogcr.yaml -USART1: +USART[12]: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml - patches/usart/merge_CR1_DEATx_fields.yaml From d7ca293c0252ae5c9df37d14772a60daa6b40860 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Thu, 6 Feb 2025 06:45:13 +0300 Subject: [PATCH 03/13] F7 --- devices/stm32f722.yaml | 40 +++++++++++++++++++++++-------- devices/stm32f723.yaml | 38 +++++++++++++++++++++++------- devices/stm32f730.yaml | 36 ++++++++++++++++++++-------- devices/stm32f732.yaml | 32 ++++++++++++++++++++----- devices/stm32f733.yaml | 40 +++++++++++++++++++++++-------- devices/stm32f745.yaml | 51 +++++++++++++++++++++++++++++----------- devices/stm32f746.yaml | 49 +++++++++++++++++++++++++++----------- devices/stm32f750.yaml | 53 +++++++++++++++++++++++++++++++----------- 8 files changed, 252 insertions(+), 87 deletions(-) diff --git a/devices/stm32f722.yaml b/devices/stm32f722.yaml index 1c56b2ea1..c509724bf 100644 --- a/devices/stm32f722.yaml +++ b/devices/stm32f722.yaml @@ -24,7 +24,7 @@ ADC2: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -37,13 +37,17 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRYP: {} + DAC: _include: - fields/dac/dac_common_2ch.yaml - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v21.yaml @@ -95,7 +99,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABH]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -105,7 +109,7 @@ GPIO[A]: GPIO[BH]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -114,18 +118,30 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIM1: {} + +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: _include: - patches/rcc/f7x23_pllsai.yaml @@ -137,6 +153,8 @@ RCC: - patches/rcc/rcc_merge_rtcsel.yaml - fields/rcc/v2/f7.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -145,14 +163,16 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/v1_common.yaml # - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC1: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f723.yaml b/devices/stm32f723.yaml index 8953660de..0b2872324 100644 --- a/devices/stm32f723.yaml +++ b/devices/stm32f723.yaml @@ -24,7 +24,7 @@ ADC2: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -37,13 +37,17 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRYP: {} + DAC: _include: - fields/dac/dac_common_2ch.yaml - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v21.yaml @@ -95,7 +99,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABH]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -105,7 +109,7 @@ GPIO[A]: GPIO[BH]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -114,18 +118,30 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIM1: {} + +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: _include: - patches/rcc/f7x23_pllsai.yaml @@ -137,6 +153,8 @@ RCC: - patches/rcc/rcc_merge_rtcsel.yaml - fields/rcc/v2/f7.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -145,12 +163,14 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/v1_common.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml +SDMMC1: {} + SPI?: _include: - patches/16bit.yaml diff --git a/devices/stm32f730.yaml b/devices/stm32f730.yaml index 2f8a1818c..ba4711aab 100644 --- a/devices/stm32f730.yaml +++ b/devices/stm32f730.yaml @@ -29,7 +29,7 @@ AES: - patches/aes/fields.yaml - fields/aes/v2.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -48,7 +48,9 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml @@ -103,7 +105,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABH]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -113,7 +115,7 @@ GPIO[A]: GPIO[BH]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -122,18 +124,28 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} OTG_HS_*: _strip: OTG_HS_ +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} + PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: _include: - patches/rcc/f7x23_pllsai.yaml @@ -153,13 +165,15 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/v1_common.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC1: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -236,6 +250,8 @@ USART1: - patches/usart/merge_CR2_ADDx_fields.yaml - fields/usart/v3/C.yaml +USBPHYC: {} + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32f732.yaml b/devices/stm32f732.yaml index 77d8e51bd..a612ab8d8 100644 --- a/devices/stm32f732.yaml +++ b/devices/stm32f732.yaml @@ -24,7 +24,7 @@ ADC2: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -37,13 +37,17 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRYP: {} + DAC: _include: - fields/dac/dac_common_2ch.yaml - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v21.yaml @@ -95,7 +99,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABH]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -105,7 +109,7 @@ GPIO[A]: GPIO[BH]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -114,9 +118,21 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIM1: {} + +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} + PWR: _include: - fields/pwr/pwr_f7.yaml @@ -137,6 +153,8 @@ RCC: - patches/rcc/rcc_merge_rtcsel.yaml - fields/rcc/v2/f7.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -145,13 +163,15 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/v1_common.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC1: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f733.yaml b/devices/stm32f733.yaml index 56874234a..12f76985a 100644 --- a/devices/stm32f733.yaml +++ b/devices/stm32f733.yaml @@ -24,7 +24,7 @@ ADC2: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -37,13 +37,17 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRYP: {} + DAC: _include: - fields/dac/dac_common_2ch.yaml - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBGMCU: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v21.yaml @@ -95,7 +99,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABH]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -105,7 +109,7 @@ GPIO[A]: GPIO[BH]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -114,18 +118,30 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIM1: {} + +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: _include: - patches/rcc/f7x23_pllsai.yaml @@ -145,13 +161,17 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +RNG: {} + +SAI1: _include: - patches/sai/v1_common.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC1: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f745.yaml b/devices/stm32f745.yaml index 4332aee82..dfd739be3 100644 --- a/devices/stm32f745.yaml +++ b/devices/stm32f745.yaml @@ -35,7 +35,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -69,17 +69,21 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml +DBGMCU: {} -DMA?: +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml - collect/dma/st.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -122,6 +126,9 @@ Ethernet_MAC: MBCA3L: name: MACA3L +#Ethernet_MMC: {} +#Ethernet_PTP: {} + FLASH: _include: - patches/flash/acr/latency_16_states.yaml @@ -152,7 +159,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABD]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -166,7 +173,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -175,6 +182,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIM1: {} + LTDC: _include: - patches/ltdc/f7_ltdc_interrupts.yaml @@ -183,18 +192,28 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: DCKCFGR1: _delete: @@ -217,6 +236,8 @@ RCC: - fields/rcc/v2/dckcfgr_saidivr.yaml - fields/rcc/v2/dckcfgr2_cecsel.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -225,17 +246,19 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SDMMC?: +SDMMC1: _include: - patches/sdio_sdmmc/f745_f750_f765_f7x6_f7x7_f7x9.yaml -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f746.yaml b/devices/stm32f746.yaml index ee08057fc..0e28093e6 100644 --- a/devices/stm32f746.yaml +++ b/devices/stm32f746.yaml @@ -32,7 +32,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -66,17 +66,19 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml +DBGMCU: {} -DMA?: +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml - collect/dma/st.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + Ethernet_DMA: DMABMR: _modify: @@ -100,6 +102,9 @@ Ethernet_MAC: MACA2L: bitWidth: 32 +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -137,7 +142,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABD]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -151,7 +156,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -160,6 +165,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIM1: {} + LTDC: _include: - patches/ltdc/f7_ltdc_interrupts.yaml @@ -168,18 +175,28 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: _include: - patches/rcc/pllsai.yaml @@ -198,6 +215,8 @@ RCC: - fields/rcc/v2/dckcfgr_saidivr.yaml - fields/rcc/v2/dckcfgr2_cecsel.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -206,17 +225,19 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SDMMC?: +SDMMC1: _include: - patches/sdio_sdmmc/f745_f750_f765_f7x6_f7x7_f7x9.yaml -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f750.yaml b/devices/stm32f750.yaml index 633e16a74..c1ef296c2 100644 --- a/devices/stm32f750.yaml +++ b/devices/stm32f750.yaml @@ -32,7 +32,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -64,15 +64,24 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml +DBGMCU: {} -DMA?: +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - fields/dma/dma_v2.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + +#Ethernet_DMA: {} +#Ethernet_MAC: {} +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -108,7 +117,7 @@ FMC: - fields/fsmc/fsmc_nand.yaml - fields/fsmc/fsmc_sd.yaml -GPIO?: +GPIO[ABD]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -122,7 +131,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -131,6 +140,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIM1: {} + LTDC: _include: - patches/ltdc/f7_ltdc_interrupts.yaml @@ -139,18 +150,28 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: _include: - patches/rcc/pllsai.yaml @@ -168,6 +189,8 @@ RCC: - fields/rcc/v2/dckcfgr_saidivr.yaml - fields/rcc/v2/dckcfgr2_cecsel.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -176,17 +199,19 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SDMMC?: +SDMMC1: _include: - patches/sdio_sdmmc/f745_f750_f765_f7x6_f7x7_f7x9.yaml -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml From 84160278898f47dfefeda66ac6051ef819f74b2b Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Thu, 6 Feb 2025 08:52:55 +0300 Subject: [PATCH 04/13] F7 --- devices/stm32f756.yaml | 49 +++++++++++++++++++++++++++----------- devices/stm32f765.yaml | 51 ++++++++++++++++++++++++++++----------- devices/stm32f767.yaml | 53 +++++++++++++++++++++++++++++------------ devices/stm32f769.yaml | 54 ++++++++++++++++++++++++++++++------------ devices/stm32f777.yaml | 53 +++++++++++++++++++++++++++++------------ devices/stm32f778.yaml | 54 ++++++++++++++++++++++++++++++------------ devices/stm32f779.yaml | 54 ++++++++++++++++++++++++++++++------------ 7 files changed, 265 insertions(+), 103 deletions(-) diff --git a/devices/stm32f756.yaml b/devices/stm32f756.yaml index aa6dc829a..c2ce6b0cc 100644 --- a/devices/stm32f756.yaml +++ b/devices/stm32f756.yaml @@ -32,7 +32,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -66,17 +66,19 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml +DBGMCU: {} -DMA?: +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v2.yaml - fields/dma/dma_v2.yaml - collect/dma/st.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + Ethernet_DMA: DMABMR: _modify: @@ -108,6 +110,9 @@ Ethernet_MAC: MBCA3L: name: MACA3L +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -145,7 +150,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABD]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -159,7 +164,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -168,6 +173,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIM1: {} + LTDC: _include: - patches/ltdc/f7_ltdc_interrupts.yaml @@ -176,18 +183,28 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: _include: - patches/rcc/pllsai.yaml @@ -206,6 +223,8 @@ RCC: - fields/rcc/v2/dckcfgr_saidivr.yaml - fields/rcc/v2/dckcfgr2_cecsel.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -214,17 +233,19 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SDMMC?: +SDMMC1: _include: - patches/sdio_sdmmc/f745_f750_f765_f7x6_f7x7_f7x9.yaml -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f765.yaml b/devices/stm32f765.yaml index a7e1675df..fc8fa3d16 100644 --- a/devices/stm32f765.yaml +++ b/devices/stm32f765.yaml @@ -33,7 +33,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -67,17 +67,21 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml +DBGMCU: {} -DMA?: +DCMI: {} + +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v21.yaml - fields/dma/dma_v21.yaml - collect/dma/st.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + Ethernet_DMA: DMABMR: _modify: @@ -109,6 +113,9 @@ Ethernet_MAC: MBCA3L: name: MACA3L +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -152,7 +159,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABD]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -166,7 +173,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -175,6 +182,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIM1: {} + LTDC: _include: - patches/ltdc/f7_ltdc_interrupts.yaml @@ -183,18 +192,28 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: PLLCFGR: _add: @@ -224,6 +243,8 @@ RCC: - fields/rcc/v2/dckcfgr_dsisel.yaml - fields/rcc/v2/dckcfgr2_cecsel.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -232,17 +253,19 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SDMMC?: +SDMMC1: _include: - patches/sdio_sdmmc/f745_f750_f765_f7x6_f7x7_f7x9.yaml -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f767.yaml b/devices/stm32f767.yaml index 6b3f089c2..0d7597461 100644 --- a/devices/stm32f767.yaml +++ b/devices/stm32f767.yaml @@ -27,7 +27,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -66,6 +66,10 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml +DBGMCU: {} + +DCMI: {} + DFSDM: _strip: DFSDM_ _modify: @@ -74,17 +78,17 @@ DFSDM: _include: - collect/dfsdm/f7.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml - -DMA?: +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v21.yaml - fields/dma/dma_v21.yaml - collect/dma/st.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + DSI: _strip: DSI_ _include: @@ -121,6 +125,9 @@ Ethernet_MAC: MBCA3L: name: MACA3L +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -160,7 +167,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABD]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -174,7 +181,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -188,6 +195,8 @@ JPEG: _include: - collect/jpeg/ram_f7.yaml +LPTIM1: {} + LTDC: _include: - patches/ltdc/f7_ltdc_interrupts.yaml @@ -201,18 +210,28 @@ MDIOS: _include: - collect/mdios/dinr_doutr.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: PLLCFGR: _add: @@ -242,6 +261,8 @@ RCC: - fields/rcc/v2/dckcfgr_dsisel.yaml - fields/rcc/v2/dckcfgr2_cecsel.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -250,17 +271,19 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SDMMC?: +SDMMC1: _include: - patches/sdio_sdmmc/f745_f750_f765_f7x6_f7x7_f7x9.yaml -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f769.yaml b/devices/stm32f769.yaml index 09032bbf4..5ed48c1a9 100644 --- a/devices/stm32f769.yaml +++ b/devices/stm32f769.yaml @@ -29,7 +29,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -63,6 +63,11 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml +# TODO: fix DBG +DBGMCU: {} + +DCMI: {} + DFSDM: _strip: DFSDM_ _modify: @@ -71,17 +76,17 @@ DFSDM: _include: - collect/dfsdm/f7.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml - -DMA?: +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v21.yaml - fields/dma/dma_v21.yaml - collect/dma/st.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + DSI: _strip: DSI_ _include: @@ -118,6 +123,9 @@ Ethernet_MAC: MBCA3L: name: MACA3L +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -157,7 +165,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABD]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -181,7 +189,7 @@ I2C2: description: I2C2 error interrupt value: 34 -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -195,6 +203,8 @@ JPEG: _include: - collect/jpeg/ram_f7.yaml +LPTIM1: {} + LTDC: _add: _interrupts: @@ -213,18 +223,28 @@ MDIOS: _include: - collect/mdios/dinr_doutr.yaml +PWR: + _include: + - fields/pwr/pwr_f7.yaml + +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} + QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _include: - - fields/pwr/pwr_f7.yaml - RCC: PLLCFGR: _add: @@ -254,6 +274,8 @@ RCC: - fields/rcc/v2/dckcfgr_dsisel.yaml - fields/rcc/v2/dckcfgr2_cecsel.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -262,17 +284,19 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SDMMC?: +SDMMC1: _include: - patches/sdio_sdmmc/f745_f750_f765_f7x6_f7x7_f7x9.yaml -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f777.yaml b/devices/stm32f777.yaml index cb595b78c..d4e4efcf6 100644 --- a/devices/stm32f777.yaml +++ b/devices/stm32f777.yaml @@ -27,7 +27,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -66,6 +66,10 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml +DBGMCU: {} + +DCMI: {} + DFSDM: _strip: DFSDM_ _modify: @@ -74,17 +78,17 @@ DFSDM: _include: - collect/dfsdm/f7.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml - -DMA?: +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v21.yaml - fields/dma/dma_v21.yaml - collect/dma/st.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + DSI: _strip: DSI_ _include: @@ -121,6 +125,9 @@ Ethernet_MAC: MBCA3L: name: MACA3L +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -160,7 +167,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABD]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -174,7 +181,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -188,6 +195,8 @@ JPEG: _include: - collect/jpeg/ram_f7.yaml +LPTIM1: {} + LTDC: _include: - patches/ltdc/f7_ltdc_interrupts.yaml @@ -201,18 +210,28 @@ MDIOS: _include: - collect/mdios/dinr_doutr.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: PLLCFGR: _add: @@ -242,6 +261,8 @@ RCC: - fields/rcc/v2/dckcfgr_dsisel.yaml - fields/rcc/v2/dckcfgr2_cecsel.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -250,17 +271,19 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SDMMC?: +SDMMC1: _include: - patches/sdio_sdmmc/f745_f750_f765_f7x6_f7x7_f7x9.yaml -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f778.yaml b/devices/stm32f778.yaml index f40ef4479..ac6f07c92 100644 --- a/devices/stm32f778.yaml +++ b/devices/stm32f778.yaml @@ -29,7 +29,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -63,6 +63,11 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml +# TODO fix DBG +DBGMCU: {} + +DCMI: {} + DFSDM: _strip: DFSDM_ _modify: @@ -71,17 +76,17 @@ DFSDM: _include: - collect/dfsdm/f7.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml - -DMA?: +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v21.yaml - fields/dma/dma_v21.yaml - collect/dma/st.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + DSI: _strip: DSI_ _include: @@ -118,6 +123,9 @@ Ethernet_MAC: MBCA3L: name: MACA3L +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -157,7 +165,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABD]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -181,7 +189,7 @@ I2C2: description: I2C2 error interrupt value: 34 -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -195,6 +203,8 @@ JPEG: _include: - collect/jpeg/ram_f7.yaml +LPTIM1: {} + LTDC: _add: _interrupts: @@ -213,18 +223,28 @@ MDIOS: _include: - collect/mdios/dinr_doutr.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: PLLCFGR: _add: @@ -254,6 +274,8 @@ RCC: - fields/rcc/v2/dckcfgr_dsisel.yaml - fields/rcc/v2/dckcfgr2_cecsel.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -262,17 +284,19 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SDMMC?: +SDMMC1: _include: - patches/sdio_sdmmc/f745_f750_f765_f7x6_f7x7_f7x9.yaml -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml diff --git a/devices/stm32f779.yaml b/devices/stm32f779.yaml index 77290e1c2..c7bad3d7e 100644 --- a/devices/stm32f779.yaml +++ b/devices/stm32f779.yaml @@ -29,7 +29,7 @@ ADC1: - fields/adc/adc_v2/adc_v2_extsel_d.yaml - collect/adc/jofr_jdr.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml @@ -63,6 +63,11 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml +# TODO fix DBG +DBGMCU: {} + +DCMI: {} + DFSDM: _strip: DFSDM_ _modify: @@ -71,17 +76,17 @@ DFSDM: _include: - collect/dfsdm/f7.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml - -DMA?: +DMA2: _include: - patches/dma/fcr_wo.yaml - patches/dma/dma_v21.yaml - fields/dma/dma_v21.yaml - collect/dma/st.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + DSI: _strip: DSI_ _include: @@ -118,6 +123,9 @@ Ethernet_MAC: MBCA3L: name: MACA3L +#Ethernet_MMC: {} +#Ethernet_PTP: {} + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -157,7 +165,7 @@ FMC: - collect/fsmc/sram.yaml - collect/fsmc/sd.yaml -GPIO?: +GPIO[ABD]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -181,7 +189,7 @@ I2C2: description: I2C2 error interrupt value: 34 -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -195,6 +203,8 @@ JPEG: _include: - collect/jpeg/ram_f7.yaml +LPTIM1: {} + LTDC: _add: _interrupts: @@ -213,18 +223,28 @@ MDIOS: _include: - collect/mdios/dinr_doutr.yaml +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + OTG_HS_*: _strip: OTG_HS_ -QUADSPI: - _include: - - patches/quadspi/dr_multi_access.yaml - - fields/quadspi/quadspi_v1_dual_flash.yaml +#OTG_HS_DEVICE: {} +#OTG_HS_GLOBAL: {} +#OTG_HS_HOST: {} +#OTG_HS_PWRCLK: {} PWR: _include: - fields/pwr/pwr_f7.yaml +QUADSPI: + _include: + - patches/quadspi/dr_multi_access.yaml + - fields/quadspi/quadspi_v1_dual_flash.yaml + RCC: PLLCFGR: _add: @@ -254,6 +274,8 @@ RCC: - fields/rcc/v2/dckcfgr_dsisel.yaml - fields/rcc/v2/dckcfgr2_cecsel.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -262,17 +284,19 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SDMMC?: +SDMMC1: _include: - patches/sdio_sdmmc/f745_f750_f765_f7x6_f7x7_f7x9.yaml -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml From 27b4a490bc001b63f976df50c1c3ffbe4006caac Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Thu, 6 Feb 2025 10:41:21 +0300 Subject: [PATCH 05/13] G0 --- devices/patches/dma/g0_5ch.yaml | 15 ++-------- devices/patches/g0_strip.yaml | 29 ------------------ devices/patches/g0x1_strip.yaml | 17 ----------- devices/stm32g030.yaml | 28 +++++++++++------- devices/stm32g031.yaml | 30 ++++++++++++------- devices/stm32g041.yaml | 30 ++++++++++++------- devices/stm32g050.yaml | 25 +++++++++++----- devices/stm32g051.yaml | 39 +++++++++++++++++++++---- devices/stm32g061.yaml | 35 +++++++++++++++++++--- devices/stm32g070.yaml | 51 ++++++++++++++++++++------------ devices/stm32g071.yaml | 39 +++++++++++++++++++++---- devices/stm32g081.yaml | 43 +++++++++++++++++++++++---- devices/stm32g0b0.yaml | 40 ++++++++++++++++--------- devices/stm32g0b1.yaml | 52 +++++++++++++++++++++++++-------- devices/stm32g0c1.yaml | 52 +++++++++++++++++++++++++-------- 15 files changed, 353 insertions(+), 172 deletions(-) delete mode 100644 devices/patches/g0_strip.yaml delete mode 100644 devices/patches/g0x1_strip.yaml diff --git a/devices/patches/dma/g0_5ch.yaml b/devices/patches/dma/g0_5ch.yaml index f91d8a61e..1bbfa95ab 100644 --- a/devices/patches/dma/g0_5ch.yaml +++ b/devices/patches/dma/g0_5ch.yaml @@ -3,20 +3,11 @@ ISR: _delete: - - "GIF[67]" - - "TCIF[67]" - - "HTIF[67]" - - "TEIF[67]" + - "*[67]" IFCR: _delete: - - "CGIF[67]" - - "CTCIF[67]" - - "CHTIF[67]" - - "CTEIF[67]" + - "*[67]" _delete: _registers: - - "CCR[67]" - - "CNDTR[67]" - - "CPAR[67]" - - "CMAR[67]" + - "*[67]" diff --git a/devices/patches/g0_strip.yaml b/devices/patches/g0_strip.yaml deleted file mode 100644 index 405d7f877..000000000 --- a/devices/patches/g0_strip.yaml +++ /dev/null @@ -1,29 +0,0 @@ -ADC: - _strip: ADC_ - -CRC: - _strip: CRC_ - -DBG: - _strip: DBG_ - -DMAMUX: - _strip: DMAMUX_ - -I2C?: - _strip: I2C_ - -IWDG: - _strip: IWDG_ - -RTC: - _strip: RTC_ - -TAMP: - _strip: TAMP_ - -TIM1: - _strip: TIM1_ - -WWDG: - _strip: WWDG_ diff --git a/devices/patches/g0x1_strip.yaml b/devices/patches/g0x1_strip.yaml deleted file mode 100644 index 035e3e710..000000000 --- a/devices/patches/g0x1_strip.yaml +++ /dev/null @@ -1,17 +0,0 @@ -_include: - - g0_strip.yaml - -DAC: - _strip: DAC_ - -HDMI_CEC: - _strip: CEC_ - -LPTIM*: - _strip: LPTIM_ - -LPUART*: - _strip: LPUART_ - -VREFBUF: - _strip: VREFBUF_ diff --git a/devices/stm32g030.yaml b/devices/stm32g030.yaml index 82a26d9cb..eb207baa0 100644 --- a/devices/stm32g030.yaml +++ b/devices/stm32g030.yaml @@ -12,6 +12,7 @@ _modify: _clear_fields: "*" ADC: + _strip: ADC_ _include: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml @@ -22,23 +23,23 @@ ADC: name: CHSELR1 alternateRegister: CHSELR0 +CRC: + _strip: CRC_ + DBG: + _strip: DBG_ APB_FZ1: _delete: DBG_TIM2_STOP -DMA*: - _strip: DMA_ - DMA1: + _strip: DMA_ _include: - patches/dma/g0_5ch.yaml - -DMA?: - _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -51,7 +52,7 @@ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -61,16 +62,20 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/g0.yaml - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +PWR: {} + RCC: _include: - patches/rcc/g0x0_delete.yaml @@ -103,12 +108,13 @@ RCC: - USART3SEL RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/16bit.yaml @@ -132,10 +138,12 @@ SYSCFG: _delete: SPI3 TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/g0_tim1_ccmr_input.yaml - patches/tim/v2/oc5m_bit3.yaml @@ -174,12 +182,12 @@ VREFBUF: _strip: VREFBUF_ WWDG: + _strip: WWDG_ _include: - patches/16bit.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/g0_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma1_5ch_only.yaml - patches/tim/group.yaml diff --git a/devices/stm32g031.yaml b/devices/stm32g031.yaml index ba3f7845c..bdde8d786 100644 --- a/devices/stm32g031.yaml +++ b/devices/stm32g031.yaml @@ -16,6 +16,7 @@ _delete: - SYSCFG_ITLINE ADC: + _strip: ADC_ SMPR: _split: - SMPSEL @@ -33,19 +34,21 @@ ADC: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml -DMA*: - _strip: DMA_ +CRC: + _strip: CRC_ + +DBG: + _strip: DBG_ DMA1: + _strip: DMA_ _include: - patches/dma/g0_5ch.yaml - -DMA?: - _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -63,7 +66,7 @@ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -73,17 +76,19 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/g0.yaml - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM*: +LPTIM1: _strip: LPTIM_ LPUART: @@ -94,6 +99,8 @@ LPUART: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml +PWR: {} + RCC: _include: - patches/rcc/g0.yaml @@ -102,12 +109,13 @@ RCC: - fields/rcc/rcc_g0x1.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/16bit.yaml @@ -119,10 +127,12 @@ SYSCFG: _include: fields/syscfg/syscfg_g0_usart2.yaml TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/g0_tim1_ccmr_input.yaml - patches/tim/v2/oc5m_bit3.yaml @@ -165,12 +175,12 @@ VREFBUF: _strip: VREFBUF_ WWDG: + _strip: WWDG_ _include: - patches/16bit.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/g0_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma1_5ch_only.yaml - patches/tim/group.yaml diff --git a/devices/stm32g041.yaml b/devices/stm32g041.yaml index 7fd8bbdd7..28147660e 100644 --- a/devices/stm32g041.yaml +++ b/devices/stm32g041.yaml @@ -16,6 +16,7 @@ _delete: - SYSCFG_ITLINE ADC: + _strip: ADC_ SMPR: _split: - SMPSEL @@ -38,19 +39,21 @@ AES: - patches/aes/fields.yaml - fields/aes/v2.yaml -DMA*: - _strip: DMA_ +CRC: + _strip: CRC_ + +DBG: + _strip: DBG_ DMA1: + _strip: DMA_ _include: - patches/dma/g0_5ch.yaml - -DMA?: - _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -68,7 +71,7 @@ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -78,17 +81,19 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/g0.yaml - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM*: +LPTIM1: _strip: LPTIM_ LPUART: @@ -99,6 +104,8 @@ LPUART: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml +PWR: {} + RCC: _include: - patches/rcc/g0.yaml @@ -107,12 +114,13 @@ RCC: - fields/rcc/rcc_g0x1_aes.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/16bit.yaml @@ -124,10 +132,12 @@ SYSCFG: _include: fields/syscfg/syscfg_g0_usart2.yaml TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/g0_tim1_ccmr_input.yaml - patches/tim/v2/oc5m_bit3.yaml @@ -170,12 +180,12 @@ VREFBUF: _strip: VREFBUF_ WWDG: + _strip: WWDG_ _include: - patches/16bit.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/g0_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma1_5ch_only.yaml - patches/tim/group.yaml diff --git a/devices/stm32g050.yaml b/devices/stm32g050.yaml index db32ef995..d31564e0d 100644 --- a/devices/stm32g050.yaml +++ b/devices/stm32g050.yaml @@ -6,6 +6,7 @@ _modify: _clear_fields: "*" ADC: + _strip: ADC_ _include: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml @@ -16,15 +17,20 @@ ADC: name: CHSELR1 alternateRegister: CHSELR0 -DMA*: - _strip: DMA_ +CRC: + _strip: CRC_ + +DBG: + _strip: DBG_ -DMA?: +DMA1: + _strip: DMA_ _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _delete: _interrupts: # in v1.5 this was moved to DMA1 @@ -46,7 +52,7 @@ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -56,11 +62,13 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml @@ -84,12 +92,13 @@ RCC: - USART3SEL RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/16bit.yaml @@ -100,10 +109,12 @@ SYSCFG: _include: fields/syscfg/syscfg_g0_usart2.yaml TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/oc1m.yaml - patches/tim/v2/oc2m.yaml @@ -157,12 +168,12 @@ USART1: - fields/usart/v4/B.yaml WWDG: + _strip: WWDG_ _include: - patches/16bit.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/g0_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma1_7ch_only.yaml - patches/tim/group.yaml diff --git a/devices/stm32g051.yaml b/devices/stm32g051.yaml index e2fb8bc5f..9b910924f 100644 --- a/devices/stm32g051.yaml +++ b/devices/stm32g051.yaml @@ -11,6 +11,7 @@ _copy: baseAddress: 0x40000400 ADC: + _strip: ADC_ _include: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml @@ -21,13 +22,25 @@ ADC: name: CHSELR1 alternateRegister: CHSELR0 -DMA?: +COMP: {} + +CRC: + _strip: CRC_ + +DAC: + _strip: DAC_ + +DBG: + _strip: DBG_ + +DMA1: _strip: DMA_ _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -40,7 +53,7 @@ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -50,21 +63,31 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +HDMI_CEC: + _strip: CEC_ + +LPTIM1: + _strip: LPTIM_ + LPUART1: _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - fields/usart/v4/lp_wl.yaml +PWR: {} + RCC: _include: - patches/rcc/g0.yaml @@ -73,12 +96,13 @@ RCC: - fields/rcc/rcc_g0x1.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/16bit.yaml @@ -89,10 +113,12 @@ SYSCFG: _include: fields/syscfg/syscfg_g0_usart2.yaml TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/oc1m.yaml - patches/tim/v2/oc2m.yaml @@ -147,13 +173,16 @@ USART1: - patches/usart/g0_CR1.yaml - fields/usart/v4/B.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/16bit.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/g0x1_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma1_7ch_only.yaml - patches/tim/group.yaml diff --git a/devices/stm32g061.yaml b/devices/stm32g061.yaml index 899f7cc67..6e2890532 100644 --- a/devices/stm32g061.yaml +++ b/devices/stm32g061.yaml @@ -11,6 +11,7 @@ _copy: baseAddress: 0x40000400 ADC: + _strip: ADC_ _include: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml @@ -24,13 +25,23 @@ ADC: AES: _strip: AES_ -DMA?: +CRC: + _strip: CRC_ + +DAC: + _strip: DAC_ + +DBG: + _strip: DBG_ + +DMA1: _strip: DMA_ _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -43,7 +54,7 @@ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -53,21 +64,31 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +HDMI_CEC: + _strip: CEC_ + +LPTIM1: + _strip: LPTIM_ + LPUART1: _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - fields/usart/v4/lp_wl.yaml +PWR: {} + RCC: _include: - patches/rcc/g0.yaml @@ -79,6 +100,7 @@ RNG: _strip: RNG_ RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml @@ -94,10 +116,12 @@ SYSCFG: _include: fields/syscfg/syscfg_g0_usart2.yaml TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/oc1m.yaml - patches/tim/v2/oc2m.yaml @@ -152,13 +176,16 @@ USART1: - patches/usart/g0_CR1.yaml - fields/usart/v4/B.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/16bit.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/g0x1_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma1_7ch_only.yaml # SPI* are missing upstream diff --git a/devices/stm32g070.yaml b/devices/stm32g070.yaml index ad96bb081..20a176564 100644 --- a/devices/stm32g070.yaml +++ b/devices/stm32g070.yaml @@ -23,22 +23,13 @@ _delete: - UCPD1 - UCPD2 - HDMI_CEC - # deleted so we can re-add them without interrupts - - TIM7 - - USART3 - -# Remove interrupts from derived Peripherals (after we renamed and moved them to the base peripherals) -# Since it is not possible to modify a derivedFrom peripheral, we delete it first -# and then add it again without the interrupts. -_add: - TIM7: - derivedFrom: TIM6 - baseAddress: "0x40001400" - USART3: - derivedFrom: USART1 - baseAddress: "0x40004800" + +_derive: + TIM7: TIM6 + USART3: USART1 ADC: + _strip: ADC_ _modify: _interrupts: ADC_COMP: @@ -53,13 +44,20 @@ ADC: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml -DMA?: +CRC: + _strip: CRC_ + +DBG: + _strip: DBG_ + +DMA1: _strip: DMA_ _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -76,7 +74,7 @@ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -86,17 +84,21 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/g0.yaml - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _modify: "KR,PR,RLR,SR,WINR": size: 16 _include: fields/iwdg/iwdg_with_WINR.yaml +PWR: {} + RCC: _include: - patches/rcc/g0x0_delete.yaml @@ -104,12 +106,13 @@ RCC: - fields/rcc/rcc_g0.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/spi/dr8.yaml @@ -126,10 +129,12 @@ SYSCFG: - VREFBUF_CCR TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/g0_tim1_ccmr_input.yaml - patches/tim/v2/oc5m_bit3.yaml @@ -165,6 +170,10 @@ TIM6: description: TIM7 global interrupt value: 18 +TIM7: + _delete: + _interrupts: "*" + TIM14: _include: - patches/tim/icpsc.yaml @@ -197,14 +206,18 @@ USART1: - patches/usart/g0.yaml - fields/usart/v4/B.yaml +USART3: + _delete: + _interrupts: "*" + WWDG: + _strip: WWDG_ _modify: "CR,CFR,SR": size: 16 _include: fields/wwdg/wwdg_v2.yaml _include: - - patches/g0_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma1_7ch_only.yaml - patches/tim/group.yaml diff --git a/devices/stm32g071.yaml b/devices/stm32g071.yaml index f98868b8a..e9884693f 100644 --- a/devices/stm32g071.yaml +++ b/devices/stm32g071.yaml @@ -13,6 +13,7 @@ _copy: baseAddress: 0x40000400 ADC: + _strip: ADC_ _include: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml @@ -23,13 +24,23 @@ ADC: name: CHSELR1 alternateRegister: CHSELR0 -DMA?: +CRC: + _strip: CRC_ + +DAC: + _strip: DAC_ + +DBG: + _strip: DBG_ + +DMA1: _strip: DMA_ _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -46,7 +57,7 @@ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -56,17 +67,25 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/g0.yaml - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _modify: "KR,PR,RLR,SR,WINR": size: 16 _include: fields/iwdg/iwdg_with_WINR.yaml +HDMI_CEC: + _strip: CEC_ + +LPTIM1: + _strip: LPTIM_ + LPUART: _strip: LPUART_ _include: @@ -75,6 +94,8 @@ LPUART: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml +PWR: {} + RCC: _include: - patches/rcc/g0.yaml @@ -96,12 +117,13 @@ RCC: - RNGSMEN RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/spi/dr8.yaml @@ -115,10 +137,12 @@ SYSCFG: _include: fields/syscfg/syscfg_g0_usart4.yaml TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/g0_tim1_ccmr_input.yaml - patches/tim/v2/oc5m_bit3.yaml @@ -168,7 +192,7 @@ TIM16: OC1M_2: name: OC1M_3 -UCPD?: +UCPD1: _include: - patches/ucpd/rxordseten_split.yaml - patches/ucpd/cfgr_missing_r.yaml @@ -180,14 +204,17 @@ USART1: - patches/usart/g0.yaml - fields/usart/v4/B.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _modify: "CR,CFR,SR": size: 16 _include: fields/wwdg/wwdg_v2.yaml _include: - - patches/g0x1_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma1_7ch_only.yaml - patches/tim/group.yaml diff --git a/devices/stm32g081.yaml b/devices/stm32g081.yaml index e2f5ae6e7..43457f2e7 100644 --- a/devices/stm32g081.yaml +++ b/devices/stm32g081.yaml @@ -13,6 +13,7 @@ _copy: baseAddress: 0x40000400 ADC: + _strip: ADC_ _include: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml @@ -28,13 +29,25 @@ AES: - patches/aes/fields.yaml - fields/aes/v2.yaml -DMA?: +COMP: {} + +CRC: + _strip: CRC_ + +DAC: + _strip: DAC_ + +DBG: + _strip: DBG_ + +DMA1: _strip: DMA_ _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -47,7 +60,7 @@ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -57,17 +70,25 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/g0.yaml - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _modify: "KR,PR,RLR,SR,WINR": size: 16 _include: fields/iwdg/iwdg_with_WINR.yaml +HDMI_CEC: + _strip: CEC_ + +LPTIM1: + _strip: LPTIM_ + LPUART: _strip: LPUART_ _include: @@ -76,6 +97,8 @@ LPUART: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml +PWR: {} + RCC: _include: - patches/rcc/g0.yaml @@ -84,13 +107,16 @@ RCC: - fields/rcc/rcc_g0x1_aes.yaml - fields/rcc/rcc_g0x1_cec.yaml +RNG: {} + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/spi/dr8.yaml @@ -104,10 +130,12 @@ SYSCFG: _include: fields/syscfg/syscfg_g0_usart4.yaml TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/g0_tim1_ccmr_input.yaml - patches/tim/v2/oc5m_bit3.yaml @@ -157,7 +185,7 @@ TIM16: OC1M_2: name: OC1M_3 -UCPD?: +UCPD1: _include: - patches/ucpd/rxordseten_split.yaml - patches/ucpd/cfgr_missing_r.yaml @@ -169,14 +197,17 @@ USART1: - patches/usart/g0.yaml - fields/usart/v4/B.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _modify: "CR,CFR,SR": size: 16 _include: fields/wwdg/wwdg_v2.yaml _include: - - patches/g0x1_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma1_7ch_only.yaml - patches/tim/group.yaml diff --git a/devices/stm32g0b0.yaml b/devices/stm32g0b0.yaml index 18fda4979..aa1787ad0 100644 --- a/devices/stm32g0b0.yaml +++ b/devices/stm32g0b0.yaml @@ -6,6 +6,7 @@ _modify: _clear_fields: "*" ADC: + _strip: ADC_ _include: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml @@ -16,19 +17,27 @@ ADC: name: CHSELR1 alternateRegister: CHSELR0 -DMA*: +CRC: + _strip: CRC_ + +DBG: + _strip: DBG_ + +DMA1: _strip: DMA_ + _include: + - fields/dma/v1.yaml + - collect/dma/v1.yaml DMA2: + _strip: DMA_ _include: - patches/dma/g0_5ch.yaml - -DMA?: - _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -41,7 +50,7 @@ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -51,11 +60,13 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml @@ -69,12 +80,13 @@ RCC: - fields/rcc/rcc_g0b.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/16bit.yaml @@ -86,10 +98,12 @@ SYSCFG: _include: fields/syscfg/syscfg_g0_usart4.yaml TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/oc1m.yaml - patches/tim/v2/oc2m.yaml @@ -133,6 +147,11 @@ TIM16: - fields/tim/v2/tim16.yaml - collect/tim/ccr.yaml +USART1: + _include: + - patches/usart/g0_CR1.yaml + - fields/usart/v4/B.yaml + USB: _strip: USB_ CNTR: @@ -145,21 +164,16 @@ USB: - fields/usb/g0_usb.yaml - collect/usb/chepr.yaml -USART1: - _include: - - patches/usart/g0_CR1.yaml - - fields/usart/v4/B.yaml - VREFBUF: _strip: VREFBUF_ WWDG: + _strip: WWDG_ _include: - patches/16bit.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/g0_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma2_5ch.yaml - patches/tim/group.yaml diff --git a/devices/stm32g0b1.yaml b/devices/stm32g0b1.yaml index 1dd30f54f..7878ebd21 100644 --- a/devices/stm32g0b1.yaml +++ b/devices/stm32g0b1.yaml @@ -14,6 +14,7 @@ _derive: TIM4: TIM3 ADC: + _strip: ADC_ _include: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml @@ -24,19 +25,32 @@ ADC: name: CHSELR1 alternateRegister: CHSELR0 -DMA*: +COMP: {} + +CRC: + _strip: CRC_ + +DAC: + _strip: DAC_ + +DBG: + _strip: DBG_ + +DMA1: _strip: DMA_ + _include: + - fields/dma/v1.yaml + - collect/dma/v1.yaml DMA2: + _strip: DMA_ _include: - patches/dma/g0_5ch.yaml - -DMA?: - _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -45,14 +59,14 @@ EXTI: - patches/exti/exti_rename.yaml - fields/exti/exti_g0.yaml -FDCAN?: +FDCAN1: _strip: FDCAN_ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -62,33 +76,44 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +HDMI_CEC: + _strip: CEC_ + +LPTIM1: + _strip: LPTIM_ + LPUART1: _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - fields/usart/v4/lp_wl.yaml +PWR: {} + RCC: _include: - patches/rcc/g0b.yaml - fields/rcc/rcc_g0b1.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/16bit.yaml @@ -100,10 +125,12 @@ SYSCFG: _include: fields/syscfg/syscfg_g0_usart4.yaml TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/oc1m.yaml - patches/tim/v2/oc2m.yaml @@ -154,10 +181,8 @@ TIM16: - fields/tim/v2/tim16.yaml - collect/tim/ccr.yaml -UCPD*: +UCPD1: _strip: UCPD_ - -UCPD?: _include: - patches/ucpd/rxordseten_split.yaml - fields/ucpd/ucpd_v2.yaml @@ -173,13 +198,16 @@ USB: - fields/usb/g0_usb.yaml - collect/usb/chepr.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/16bit.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/g0x1_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma2_5ch.yaml - patches/tim/group.yaml diff --git a/devices/stm32g0c1.yaml b/devices/stm32g0c1.yaml index 5ce9dc300..49c785f16 100644 --- a/devices/stm32g0c1.yaml +++ b/devices/stm32g0c1.yaml @@ -11,6 +11,7 @@ _copy: baseAddress: 0x40000400 ADC: + _strip: ADC_ _include: - fields/adc/c0_g0_wl.yaml - collect/adc/c0_g0_wl.yaml @@ -26,19 +27,32 @@ AES: _include: - fields/aes/v2.yaml -DMA*: +COMP: {} + +CRC: + _strip: CRC_ + +DAC: + _strip: DAC_ + +DBG: + _strip: DBG_ + +DMA1: _strip: DMA_ + _include: + - fields/dma/v1.yaml + - collect/dma/v1.yaml DMA2: + _strip: DMA_ _include: - patches/dma/g0_5ch.yaml - -DMA?: - _include: - fields/dma/v1.yaml - collect/dma/v1.yaml DMAMUX: + _strip: DMAMUX_ _include: - collect/dma/dmamux.yaml @@ -47,14 +61,14 @@ EXTI: - patches/exti/exti_rename.yaml - fields/exti/exti_g0.yaml -FDCAN?: +FDCAN1: _strip: FDCAN_ FLASH: _include: - patches/flash/g0.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2.yaml @@ -64,21 +78,31 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +HDMI_CEC: + _strip: CEC_ + +LPTIM1: + _strip: LPTIM_ + LPUART1: _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - fields/usart/v4/lp_wl.yaml +PWR: {} + RCC: CCIPR2: _modify: @@ -94,12 +118,13 @@ RNG: _strip: RNG_ RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _strip: SPI_ _include: - patches/16bit.yaml @@ -111,10 +136,12 @@ SYSCFG: _include: fields/syscfg/syscfg_g0_usart4.yaml TAMP: + _strip: TAMP_ _include: - collect/rtc/tamp_bkpr.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/v2/oc1m.yaml - patches/tim/v2/oc2m.yaml @@ -165,10 +192,8 @@ TIM16: - fields/tim/v2/tim16.yaml - collect/tim/ccr.yaml -UCPD*: +UCPD1: _strip: UCPD_ - -UCPD?: _include: - patches/ucpd/rxordseten_split.yaml - fields/ucpd/ucpd_v2.yaml @@ -184,13 +209,16 @@ USB: - fields/usb/g0_usb.yaml - collect/usb/chepr.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/16bit.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/g0x1_strip.yaml - patches/nvic/2_prio_bits.yaml - patches/dma/g0_dma2_5ch.yaml - patches/tim/group.yaml From c95a07ddeae846a44449324b9dc064155c59f87e Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Thu, 6 Feb 2025 11:21:40 +0300 Subject: [PATCH 06/13] G4 --- devices/stm32g431.yaml | 32 ++++++++++++++++++++++++-------- devices/stm32g441.yaml | 24 +++++++++++++++++++----- devices/stm32g471.yaml | 24 +++++++++++++++++++----- devices/stm32g473.yaml | 36 ++++++++++++++++++++++++++++-------- devices/stm32g474.yaml | 32 ++++++++++++++++++++++---------- devices/stm32g483.yaml | 40 +++++++++++++++++++++++++++++----------- devices/stm32g484.yaml | 36 +++++++++++++++++++++++++----------- devices/stm32g491.yaml | 24 +++++++++++++++++++----- devices/stm32g4a1.yaml | 22 +++++++++++++++++----- 9 files changed, 202 insertions(+), 68 deletions(-) diff --git a/devices/stm32g431.yaml b/devices/stm32g431.yaml index 6da2ec552..a11509895 100644 --- a/devices/stm32g431.yaml +++ b/devices/stm32g431.yaml @@ -18,7 +18,7 @@ ADC1: SQR*: SQ*: [0, 18] -ADC*_*: +ADC12_Common: _include: fields/adc/adc_v3_common_g4.yaml AES: @@ -34,13 +34,19 @@ CORDIC: - patches/cordic/g4.yaml - fields/cordic/v1.yaml -DAC?: +CRC: {} + +CRS: {} + +DAC1: _strip: DAC_ _include: - fields/dac/dac_wl.yaml - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml +DBGMCU: {} + DMA1: _include: - patches/dma/g4_ifcr.yaml @@ -59,11 +65,13 @@ EXTI: FDCAN: _strip: FDCAN_ +FMAC: {} + FLASH: _include: - fields/flash/flash_g4.yaml -GPIO?: +GPIO[ABC]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -73,7 +81,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -82,6 +90,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIMER1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -90,6 +100,8 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml +OPAMP: {} + PWR: _strip: PWR_ @@ -99,6 +111,8 @@ RCC: - fields/rcc/g4.yaml - fields/rcc/rcc_g4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -113,11 +127,13 @@ SAI: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TAMP: _include: - collect/rtc/tamp_bkpr.yaml @@ -170,9 +186,6 @@ UCPD1: - patches/ucpd/tx_rx_missing_r.yaml - fields/ucpd/ucpd_v1.yaml -VREFBUF: - _strip: VREFBUF_ - "UART4,USART1": _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -187,6 +200,9 @@ USB: _include: - patches/usb/g4.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32g441.yaml b/devices/stm32g441.yaml index 0aa9f20e1..c0f07189b 100644 --- a/devices/stm32g441.yaml +++ b/devices/stm32g441.yaml @@ -18,7 +18,7 @@ ADC1: SQR*: SQ*: [0, 18] -ADC*_*: +ADC12_Common: _include: fields/adc/adc_v3_common_g4.yaml AES: @@ -34,13 +34,19 @@ CORDIC: - patches/cordic/g4.yaml - fields/cordic/v1.yaml -DAC?: +CRC: {} + +CRS: {} + +DAC1: _strip: DAC_ _include: - fields/dac/dac_wl.yaml - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml +DBGMCU: {} + DMA1: _include: - patches/dma/g4_ifcr.yaml @@ -63,7 +69,9 @@ FLASH: _include: - fields/flash/flash_g4.yaml -GPIO?: +FMAC: {} + +GPIO[ABC]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -73,7 +81,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -82,6 +90,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIMER1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -99,6 +109,8 @@ RCC: - fields/rcc/g4.yaml - fields/rcc/rcc_g4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -113,11 +125,13 @@ SAI: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TAMP: _include: - collect/rtc/tamp_bkpr.yaml diff --git a/devices/stm32g471.yaml b/devices/stm32g471.yaml index 622b6ea88..735935050 100644 --- a/devices/stm32g471.yaml +++ b/devices/stm32g471.yaml @@ -19,7 +19,7 @@ ADC[13]: SQR*: SQ*: [0, 18] -ADC*_*: +ADC12_Common: _include: fields/adc/adc_v3_common_g4.yaml AES: @@ -35,13 +35,19 @@ CORDIC: - patches/cordic/g4.yaml - fields/cordic/v1.yaml -DAC?: +CRC: {} + +CRS: {} + +DAC1: _strip: DAC_ _include: - fields/dac/dac_wl.yaml - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml +DBGMCU: {} + DMA1: _include: - patches/dma/g4_ifcr.yaml @@ -67,7 +73,9 @@ FLASH: - fields/flash/flash_g4.yaml - fields/flash/flash_g4_dual_bank.yaml -GPIO?: +FMAC: {} + +GPIO[ABC]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -77,7 +85,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -86,6 +94,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIMER1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -114,6 +124,8 @@ RCC: - fields/rcc/g4.yaml - fields/rcc/rcc_g4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -128,11 +140,13 @@ SAI: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TAMP: _include: - collect/rtc/tamp_bkpr.yaml diff --git a/devices/stm32g473.yaml b/devices/stm32g473.yaml index b3b19b080..e0f8ab0d4 100644 --- a/devices/stm32g473.yaml +++ b/devices/stm32g473.yaml @@ -19,7 +19,7 @@ ADC[13]: SQR*: SQ*: [0, 18] -ADC*_*: +ADC12_Common: _include: fields/adc/adc_v3_common_g4.yaml AES: @@ -35,13 +35,19 @@ CORDIC: - patches/cordic/g4.yaml - fields/cordic/v1.yaml -DAC?: +CRC: {} + +CRS: {} + +DAC1: _strip: DAC_ _include: - fields/dac/dac_wl.yaml - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml +DBGMCU: {} + DMA1: _include: - patches/dma/g4_ifcr.yaml @@ -60,13 +66,19 @@ EXTI: FDCAN: _strip: FDCAN_ +FDCAN1: {} + FLASH: _include: - patches/flash/g4_dual_bank.yaml - fields/flash/flash_g4.yaml - fields/flash/flash_g4_dual_bank.yaml -GPIO?: +FMAC: {} + +FMC: {} + +GPIO[ABC]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -76,7 +88,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -85,6 +97,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIMER1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -93,6 +107,11 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml +OPAMP: {} + +PWR: + _strip: PWR_ + QUADSPI: CCR: _add: @@ -104,15 +123,14 @@ QUADSPI: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _strip: PWR_ - RCC: _strip: RCC_ _include: - fields/rcc/g4.yaml - fields/rcc/rcc_g4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -127,11 +145,13 @@ SAI: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TAMP: _include: - collect/rtc/tamp_bkpr.yaml diff --git a/devices/stm32g474.yaml b/devices/stm32g474.yaml index 38940e538..80bdd6ee3 100644 --- a/devices/stm32g474.yaml +++ b/devices/stm32g474.yaml @@ -19,7 +19,7 @@ ADC[13]: SQR*: SQ*: [0, 18] -ADC*_*: +ADC12_Common: _include: fields/adc/adc_v3_common_g4.yaml COMP: @@ -30,13 +30,15 @@ CORDIC: - patches/cordic/g4.yaml - fields/cordic/v1.yaml -DAC?: +DAC1: _strip: DAC_ _include: - fields/dac/dac_wl.yaml - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml +DBGMCU: {} + DMA1: _include: - patches/dma/g4_ifcr.yaml @@ -62,7 +64,11 @@ FLASH: - fields/flash/flash_g4.yaml - fields/flash/flash_g4_dual_bank.yaml -GPIO?: +FMAC: {} + +FMC: {} + +GPIO[ABC]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -72,7 +78,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -81,6 +87,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIMER1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -89,8 +97,10 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml -VREFBUF: - _strip: VREFBUF_ +OPAMP: {} + +PWR: + _strip: PWR_ QUADSPI: CCR: @@ -103,15 +113,14 @@ QUADSPI: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _strip: PWR_ - RCC: _strip: RCC_ _include: - fields/rcc/g4.yaml - fields/rcc/rcc_g4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -126,7 +135,7 @@ SAI: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -197,6 +206,9 @@ USB: _include: - patches/usb/g4.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32g483.yaml b/devices/stm32g483.yaml index f15e4fa7a..e172b2a50 100644 --- a/devices/stm32g483.yaml +++ b/devices/stm32g483.yaml @@ -19,7 +19,7 @@ ADC[13]: SQR*: SQ*: [0, 18] -ADC*_*: +ADC12_Common: _include: fields/adc/adc_v3_common_g4.yaml AES: @@ -35,13 +35,19 @@ CORDIC: - patches/cordic/g4.yaml - fields/cordic/v1.yaml -DAC?: +CRC: {} + +CRS: {} + +DAC1: _strip: DAC_ _include: - fields/dac/dac_wl.yaml - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml +DBGMCU: {} + DMA1: _include: - patches/dma/g4_ifcr.yaml @@ -67,7 +73,11 @@ FLASH: - fields/flash/flash_g4.yaml - fields/flash/flash_g4_dual_bank.yaml -GPIO?: +FMAC: {} + +FMC: {} + +GPIO[ABC]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -77,7 +87,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -86,6 +96,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIMER1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -94,6 +106,11 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml +OPAMP: {} + +PWR: + _strip: PWR_ + QUADSPI: CCR: _add: @@ -105,15 +122,14 @@ QUADSPI: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _strip: PWR_ - RCC: _strip: RCC_ _include: - fields/rcc/g4.yaml - fields/rcc/rcc_g4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -128,11 +144,13 @@ SAI: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TAMP: _include: - collect/rtc/tamp_bkpr.yaml @@ -178,9 +196,6 @@ TIM16: - fields/tim/v3/tim16.yaml - collect/tim/ccr.yaml -VREFBUF: - _strip: VREFBUF_ - UCPD1: _include: - patches/ucpd/rxordseten_split.yaml @@ -202,6 +217,9 @@ USB: _include: - patches/usb/g4.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32g484.yaml b/devices/stm32g484.yaml index 062424abd..35c7156cf 100644 --- a/devices/stm32g484.yaml +++ b/devices/stm32g484.yaml @@ -19,7 +19,7 @@ ADC[13]: SQR*: SQ*: [0, 18] -ADC*_*: +ADC12_Common: _include: fields/adc/adc_v3_common_g4.yaml AES: @@ -35,13 +35,15 @@ CORDIC: - patches/cordic/g4.yaml - fields/cordic/v1.yaml -DAC?: +DAC1: _strip: DAC_ _include: - fields/dac/dac_wl.yaml - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml +DBGMCU: {} + DMA1: _include: - patches/dma/g4_ifcr.yaml @@ -67,7 +69,11 @@ FLASH: - fields/flash/flash_g4.yaml - fields/flash/flash_g4_dual_bank.yaml -GPIO?: +FMAC: {} + +FMC: {} + +GPIO[ABC]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -77,7 +83,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -86,6 +92,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIMER1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -94,6 +102,11 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml +OPAMP: {} + +PWR: + _strip: PWR_ + QUADSPI: CCR: _add: @@ -105,15 +118,14 @@ QUADSPI: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _strip: PWR_ - RCC: _strip: RCC_ _include: - fields/rcc/g4.yaml - fields/rcc/rcc_g4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -128,11 +140,13 @@ SAI: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TAMP: _include: - collect/rtc/tamp_bkpr.yaml @@ -178,9 +192,6 @@ TIM16: - fields/tim/v3/tim16.yaml - collect/tim/ccr.yaml -VREFBUF: - _strip: VREFBUF_ - UCPD1: _include: - patches/ucpd/rxordseten_split.yaml @@ -202,6 +213,9 @@ USB: _include: - patches/usb/g4.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32g491.yaml b/devices/stm32g491.yaml index d516b3730..557b3dec0 100644 --- a/devices/stm32g491.yaml +++ b/devices/stm32g491.yaml @@ -24,7 +24,7 @@ ADC[13]: SQR*: SQ*: [0, 18] -ADC*_*: +ADC12_Common: _include: fields/adc/adc_v3_common_g4.yaml COMP: @@ -35,13 +35,19 @@ CORDIC: - patches/cordic/g4.yaml - fields/cordic/v1.yaml -DAC?: +CRC: {} + +CRS: {} + +DAC1: _strip: DAC_ _include: - fields/dac/dac_wl.yaml - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml +DBGMCU: {} + DMA1: _include: - patches/dma/g4_ifcr.yaml @@ -74,7 +80,9 @@ FLASH: _include: - fields/flash/flash_g4.yaml -GPIO?: +FMAC: {} + +GPIO[ABC]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -84,7 +92,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -93,6 +101,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIMER1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -121,6 +131,8 @@ RCC: - fields/rcc/g4.yaml - fields/rcc/rcc_g4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -135,11 +147,13 @@ SAI: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TAMP: _include: - collect/rtc/tamp_bkpr.yaml diff --git a/devices/stm32g4a1.yaml b/devices/stm32g4a1.yaml index 31185a5c1..397d353eb 100644 --- a/devices/stm32g4a1.yaml +++ b/devices/stm32g4a1.yaml @@ -24,7 +24,7 @@ ADC[13]: SQR*: SQ*: [0, 18] -ADC*_*: +ADC12_Common: _include: fields/adc/adc_v3_common_g4.yaml AES: @@ -40,13 +40,19 @@ CORDIC: - patches/cordic/g4.yaml - fields/cordic/v1.yaml -DAC?: +CRC: {} + +CRS: {} + +DAC1: _strip: DAC_ _include: - fields/dac/dac_wl.yaml - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml +DBGMCU: {} + DMA1: _include: - patches/dma/g4_ifcr.yaml @@ -79,7 +85,9 @@ FLASH: _include: - fields/flash/flash_g4.yaml -GPIO?: +FMAC: {} + +GPIO[ABC]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -89,7 +97,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -98,6 +106,8 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +LPTIMER1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -126,6 +136,8 @@ RCC: - fields/rcc/g4.yaml - fields/rcc/rcc_g4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -140,7 +152,7 @@ SAI: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml From ee6b858c1bede54dcb400491e8298f1afcde1cb8 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Thu, 6 Feb 2025 13:03:49 +0300 Subject: [PATCH 07/13] H5 --- devices/fields/crs/crs.yaml | 99 +++++++++--------- devices/fields/sbs/sbs.yaml | 163 +++++++++++++++--------------- devices/patches/exti/exti4_5.yaml | 5 + devices/patches/h5.yaml | 100 ------------------ devices/patches/h523_h533.yaml | 32 ------ devices/patches/h56x_h57x.yaml | 11 -- devices/patches/h5_security.yaml | 11 -- devices/patches/sbs/fmplus.yaml | 9 ++ devices/patches/sbs/sbs.yaml | 11 +- devices/stm32h503.yaml | 76 ++++++++++++-- devices/stm32h523.yaml | 114 ++++++++++++++++----- devices/stm32h533.yaml | 129 ++++++++++++++++++----- devices/stm32h562.yaml | 118 +++++++++++++++++---- devices/stm32h563.yaml | 116 ++++++++++++++++++--- devices/stm32h573.yaml | 127 ++++++++++++++++++++--- 15 files changed, 719 insertions(+), 402 deletions(-) create mode 100644 devices/patches/exti/exti4_5.yaml delete mode 100644 devices/patches/h5.yaml delete mode 100644 devices/patches/h523_h533.yaml delete mode 100644 devices/patches/h56x_h57x.yaml delete mode 100644 devices/patches/h5_security.yaml create mode 100644 devices/patches/sbs/fmplus.yaml diff --git a/devices/fields/crs/crs.yaml b/devices/fields/crs/crs.yaml index b16b7beea..d870e750f 100644 --- a/devices/fields/crs/crs.yaml +++ b/devices/fields/crs/crs.yaml @@ -1,53 +1,52 @@ -CRS: - CR: - TRIM: [0, 0x3F] - SWSYNC: - Sync: [1, A software sync is generated] - AUTOTRIMEN: - Disabled: [0, Automatic trimming disabled] - Enabled: [1, Automatic trimming enabled] - CEN: - Disabled: [0, Frequency error counter disabled] - Enabled: [1, Frequency error counter enabled] - "*IE": - Disabled: [0, Interrupt disabled] - Enabled: [1, Interrupt enabled] +CR: + TRIM: [0, 0x3F] + SWSYNC: + Sync: [1, A software sync is generated] + AUTOTRIMEN: + Disabled: [0, Automatic trimming disabled] + Enabled: [1, Automatic trimming enabled] + CEN: + Disabled: [0, Frequency error counter disabled] + Enabled: [1, Frequency error counter enabled] + "*IE": + Disabled: [0, Interrupt disabled] + Enabled: [1, Interrupt enabled] - CFGR: - SYNCPOL: - RisingEdge: [0, SYNC active on rising edge] - FallingEdge: [1, SYNC active on falling edge] - SYNCSRC: - GPIO_AF: [0, GPIO AF (crs_sync_in_1) selected as SYNC signal source] - LSE: [1, LSE (crs_sync_in_2) selected as SYNC signal source] - USB_SOF: [2, USB SOF (crs_sync_in_3) selected as SYNC signal source] - SYNCDIV: - NotDivided: [0, SYNC not divided] - DivideBy2: [1, SYNC divided by 2] - DivideBy4: [2, SYNC divided by 4] - DivideBy8: [3, SYNC divided by 8] - DivideBy16: [4, SYNC divided by 16] - DivideBy32: [5, SYNC divided by 32] - DivideBy64: [6, SYNC divided by 64] - DivideBy128: [7, SYNC divided by 128] - FELIM: [0, 0xFF] - RELOAD: [0, 0xFFFF] +CFGR: + SYNCPOL: + RisingEdge: [0, SYNC active on rising edge] + FallingEdge: [1, SYNC active on falling edge] + SYNCSRC: + GPIO_AF: [0, GPIO AF (crs_sync_in_1) selected as SYNC signal source] + LSE: [1, LSE (crs_sync_in_2) selected as SYNC signal source] + USB_SOF: [2, USB SOF (crs_sync_in_3) selected as SYNC signal source] + SYNCDIV: + NotDivided: [0, SYNC not divided] + DivideBy2: [1, SYNC divided by 2] + DivideBy4: [2, SYNC divided by 4] + DivideBy8: [3, SYNC divided by 8] + DivideBy16: [4, SYNC divided by 16] + DivideBy32: [5, SYNC divided by 32] + DivideBy64: [6, SYNC divided by 64] + DivideBy128: [7, SYNC divided by 128] + FELIM: [0, 0xFF] + RELOAD: [0, 0xFFFF] - ISR: - FECAP: [0, 0xFFFF] - FEDIR: - UpCounting: [0, Error in up-counting direction] - DownCounting: [1, Error in down-counting direction] - SYNCMISS: - NotSignaled: [0, Signal not set] - Signaled: [1, Signal set] - SYNCERR: - NotSignaled: [0, Signal not set] - Signaled: [1, Signal set] - "*F": - NotSignaled: [0, Signal not set] - Signaled: [1, Signal set] +ISR: + FECAP: [0, 0xFFFF] + FEDIR: + UpCounting: [0, Error in up-counting direction] + DownCounting: [1, Error in down-counting direction] + SYNCMISS: + NotSignaled: [0, Signal not set] + Signaled: [1, Signal set] + SYNCERR: + NotSignaled: [0, Signal not set] + Signaled: [1, Signal set] + "*F": + NotSignaled: [0, Signal not set] + Signaled: [1, Signal set] - ICR: - "*C": - Clear: [1, Clear flag] +ICR: + "*C": + Clear: [1, Clear flag] diff --git a/devices/fields/sbs/sbs.yaml b/devices/fields/sbs/sbs.yaml index bdba91f4a..b25dd867f 100644 --- a/devices/fields/sbs/sbs.yaml +++ b/devices/fields/sbs/sbs.yaml @@ -1,97 +1,96 @@ # System configuration, boot, and security (SBS). Applicable to H5 family, at least. -SBS: - HDPLCR: - INCR_HDPL: - Increment: [0x6A, Increment HDPL value] +HDPLCR: + INCR_HDPL: + Increment: [0x6A, Increment HDPL value] - HDPLSR: - HDPL: - _read: - HDPL0: [0xB4, Protection level reserved for ST code and data] - HDPL1: [0x51, Protection level to be used to execute and protect immutable Root of Trust (IROT) stage] - HDPL2: [0x8A, Protection level to be used to execute and protect an updatable Root of Trust (UROT) stage] - HDPL3: [0x6F, Protection level to be used to execute the application] - - DBGCR: - DBG_AUTH_HDPL: +HDPLSR: + HDPL: + _read: + HDPL0: [0xB4, Protection level reserved for ST code and data] HDPL1: [0x51, Protection level to be used to execute and protect immutable Root of Trust (IROT) stage] HDPL2: [0x8A, Protection level to be used to execute and protect an updatable Root of Trust (UROT) stage] HDPL3: [0x6F, Protection level to be used to execute the application] - DBG_UNLOCK: - Unlocked: [0xB4, "Debug unlocked when HDPLSR:HDPL is equal to DBG_AUTH_HDPL"] - AP_UNLOCK: - Unlocked: [0xB4, Device access port unlocked] - DBGLOCKR: - DBGCFG_LOCK: - _write: - Locked: [0xC3, Debug configuration register (DBGCR) locked] - Unlocked: [0xB4, Debug configuration register (DBGCR) unlocked] - _read: - Locked: [0x6A, Debug configuration register (DBGCR) locked] - Unlocked: [0xB4, Debug configuration register (DBGCR) unlocked] +DBGCR: + DBG_AUTH_HDPL: + HDPL1: [0x51, Protection level to be used to execute and protect immutable Root of Trust (IROT) stage] + HDPL2: [0x8A, Protection level to be used to execute and protect an updatable Root of Trust (UROT) stage] + HDPL3: [0x6F, Protection level to be used to execute the application] + DBG_UNLOCK: + Unlocked: [0xB4, "Debug unlocked when HDPLSR:HDPL is equal to DBG_AUTH_HDPL"] + AP_UNLOCK: + Unlocked: [0xB4, Device access port unlocked] + +DBGLOCKR: + DBGCFG_LOCK: + _write: + Locked: [0xC3, Debug configuration register (DBGCR) locked] + Unlocked: [0xB4, Debug configuration register (DBGCR) unlocked] + _read: + Locked: [0x6A, Debug configuration register (DBGCR) locked] + Unlocked: [0xB4, Debug configuration register (DBGCR) unlocked] - PMCR: - PB8_FMP: - Disabled: [0, Fast-mode Plus mode on PB8 disabled] - Enabled: [1, Fast-mode Plus mode on PB8 enabled] - PB7_FMP: - Disabled: [0, Fast-mode Plus mode on PB7 disabled] - Enabled: [1, Fast-mode Plus mode on PB7 enabled] - PB6_FMP: - Disabled: [0, Fast-mode Plus mode on PB6 disabled] - Enabled: [1, Fast-mode Plus mode on PB6 enabled] +PMCR: + PB8_FMP: + Disabled: [0, Fast-mode Plus mode on PB8 disabled] + Enabled: [1, Fast-mode Plus mode on PB8 enabled] + PB7_FMP: + Disabled: [0, Fast-mode Plus mode on PB7 disabled] + Enabled: [1, Fast-mode Plus mode on PB7 enabled] + PB6_FMP: + Disabled: [0, Fast-mode Plus mode on PB6 disabled] + Enabled: [1, Fast-mode Plus mode on PB6 enabled] - FPUIMR: - FPU_IE?: - Disabled: [0, Interrupt disabled] - Enabled: [1, Interrupt enabled] +FPUIMR: + FPU_IE?: + Disabled: [0, Interrupt disabled] + Enabled: [1, Interrupt enabled] - MESR: - IPMEE: - _read: - EraseInProgress: [0, ICACHE erase ongoing] - EraseCompleted: [1, ICACHE erase completed] - _W1C: - Clear: [1, Clear ICACHE erase status flag] - MCLR: - _read: - EraseInProgress: [0, Memory erase in progress] - EraseComplete: [1, Memory erase complete] - _W1C: - Clear: [1, Clear memory erase status flag] +MESR: + IPMEE: + _read: + EraseInProgress: [0, ICACHE erase ongoing] + EraseCompleted: [1, ICACHE erase completed] + _W1C: + Clear: [1, Clear ICACHE erase status flag] + MCLR: + _read: + EraseInProgress: [0, Memory erase in progress] + EraseComplete: [1, Memory erase complete] + _W1C: + Clear: [1, Clear memory erase status flag] - CCCSR: - RDY?: - _read: - NotReady: [0, VDDIO compensation cell not ready] - Ready: [1, VDDIO compensation cell ready] - CS?: - Cell: [0, Code from cell selected] - CCSWCR: [1, Code from CCSWCR selected] - EN?: - Disabled: [0, I/O compensation cell disabled] - Enabled: [1, I/O compensation cell enabled] +CCCSR: + RDY?: + _read: + NotReady: [0, VDDIO compensation cell not ready] + Ready: [1, VDDIO compensation cell ready] + CS?: + Cell: [0, Code from cell selected] + CCSWCR: [1, Code from CCSWCR selected] + EN?: + Disabled: [0, I/O compensation cell disabled] + Enabled: [1, I/O compensation cell enabled] - CCSWCR: - SW_APSRC?: [0, 0xF] - SW_ANSRC?: [0, 0xF] +CCSWCR: + SW_APSRC?: [0, 0xF] + SW_ANSRC?: [0, 0xF] - CFGR2: - "*L": - Disconnected: [0, Flag/Interrupt disconnected from timer break inputs] - Connected: [1, Flag/Interrupt connected to timer break inputs] +CFGR2: + "*L": + Disconnected: [0, Flag/Interrupt disconnected from timer break inputs] + Connected: [1, Flag/Interrupt connected to timer break inputs] - CNSLCKR: - LOCKNSMPU: - Unlocked: [0, MPU registers write enabled] - Locked: [1, MPU registers write disabled] - LOCKNSVTOR: - Unlocked: [0, VTOR_NS register write enabled] - Locked: [1, VTOR_NS register write disabled] +CNSLCKR: + LOCKNSMPU: + Unlocked: [0, MPU registers write enabled] + Locked: [1, MPU registers write disabled] + LOCKNSVTOR: + Unlocked: [0, VTOR_NS register write enabled] + Locked: [1, VTOR_NS register write disabled] - ECCNMIR: - ECCNMI_MASK_EN: - Enabled: [0, NMI enabled] - Disabled: [1, NMI disabled] +ECCNMIR: + ECCNMI_MASK_EN: + Enabled: [0, NMI enabled] + Disabled: [1, NMI disabled] diff --git a/devices/patches/exti/exti4_5.yaml b/devices/patches/exti/exti4_5.yaml new file mode 100644 index 000000000..300307f08 --- /dev/null +++ b/devices/patches/exti/exti4_5.yaml @@ -0,0 +1,5 @@ +_modify: + _interrupts: + EXTI4_5: + name: EXTI4_15 + description: EXTI line 4 to 15 interrupt diff --git a/devices/patches/h5.yaml b/devices/patches/h5.yaml deleted file mode 100644 index 2b1fc6de3..000000000 --- a/devices/patches/h5.yaml +++ /dev/null @@ -1,100 +0,0 @@ -_clear_fields: "*" - -CRC: - _strip: CRC_ - -CRS: - _strip: CRS_ - -DAC: - _strip: DAC_ - -DBGMCU: - _strip: DBGMCU_ - -DTS: - _strip: DTS_ - -EXTI: - _strip: EXTI_ - _modify: - _interrupts: - EXTI4_5: - name: EXTI4_15 - description: EXTI line 4 to 15 interrupt - -FLASH: - _strip: FLASH_ - -FDCAN?: - _strip: FDCAN?_ - -GPIO?: - _strip: GPIO?_ - -HASH: - _strip: HASH_ - -I2C?: - _strip: I2C_ - -ICACHE: - _strip: ICACHE_ - -IWDG: - _strip: IWDG_ - -LPTIM?: - _strip: LPTIM_ - -LPUART: - _strip: LPUART_ - -PWR: - _strip: PWR_ - -RAMCFG: - _strip: RAMCFG_ - -RCC: - _strip: RCC_ - -RNG: - _strip: RNG_ - -RTC: - _strip: RTC_ - -SBS: - _strip: SBS_ - PMCR: - # Rename these fields on H503 to match other H5 processors - _modify: - PB6_FMPLUS: - name: PB6_FMP - PB7_FMPLUS: - name: PB7_FMP - PB8_FMPLUS: - name: PB8_FMP - -SPI?: - _strip: SPI_ - -TAMP: - _strip: TAMP_ - -USB: - _strip: USB_ - -WWDG: - _strip: WWDG_ - -# TIM3: -# _delete: CNT -# _modify: -# CNT_alternate: -# name: CNT - -_include: - - sbs/sbs.yaml - #- gpdma/gpdma.yaml diff --git a/devices/patches/h523_h533.yaml b/devices/patches/h523_h533.yaml deleted file mode 100644 index 896462e3a..000000000 --- a/devices/patches/h523_h533.yaml +++ /dev/null @@ -1,32 +0,0 @@ -DLYBOS?: - _strip: DLYB_ - -DCACHE: - _strip: DCACHE_ - -DCMI: - _strip: DCMI_ - -FMC: - _strip: FMC_ - -GTZC1_TZSC: - _strip: GTZC1_TZSC_ - -I3C*: - _strip: I3C_ - -OCTOSPI: - _strip: OCTOSPI_ - -PSSI: - _strip: PSSI_ - -SDMMC?: - _strip: SDMMC_ - -UCPD?: - _strip: UCPD_ - -VREFBUF: - _strip: VREFBUF_ diff --git a/devices/patches/h56x_h57x.yaml b/devices/patches/h56x_h57x.yaml deleted file mode 100644 index fa8a632e5..000000000 --- a/devices/patches/h56x_h57x.yaml +++ /dev/null @@ -1,11 +0,0 @@ -_include: - ./h523_h533.yaml - -CORDIC: - _strip: CORDIC_ - -FMAC: - _strip: FMAC_ - -SAI?: - _strip: SAI_ \ No newline at end of file diff --git a/devices/patches/h5_security.yaml b/devices/patches/h5_security.yaml deleted file mode 100644 index be4822508..000000000 --- a/devices/patches/h5_security.yaml +++ /dev/null @@ -1,11 +0,0 @@ -AES: - _strip: AES_ - -OTFDEC?: - _strip: OTFDEC_ - -PKA: - _strip: PKA_ - -SAES: - _strip: SAES_ diff --git a/devices/patches/sbs/fmplus.yaml b/devices/patches/sbs/fmplus.yaml new file mode 100644 index 000000000..ea72a1973 --- /dev/null +++ b/devices/patches/sbs/fmplus.yaml @@ -0,0 +1,9 @@ +PMCR: + # Rename these fields on H503 to match other H5 processors + _modify: + PB6_FMPLUS: + name: PB6_FMP + PB7_FMPLUS: + name: PB7_FMP + PB8_FMPLUS: + name: PB8_FMP diff --git a/devices/patches/sbs/sbs.yaml b/devices/patches/sbs/sbs.yaml index cc28ec8aa..3ae86983b 100644 --- a/devices/patches/sbs/sbs.yaml +++ b/devices/patches/sbs/sbs.yaml @@ -1,6 +1,5 @@ -SBS: - FPUIMR: - _split: - FPU_IE: - name: FPU_IE%s - description: FPU interrupt enable +FPUIMR: + _split: + FPU_IE: + name: FPU_IE%s + description: FPU interrupt enable diff --git a/devices/stm32h503.yaml b/devices/stm32h503.yaml index 5a212b9ba..595ca090b 100644 --- a/devices/stm32h503.yaml +++ b/devices/stm32h503.yaml @@ -1,10 +1,12 @@ _svd: ../svd/stm32h503.svd +_clear_fields: "*" + _modify: ADC: name: ADC1 -ADC?: +ADC1: _strip: ADC_ _include: - patches/adc/split.yaml @@ -16,15 +18,39 @@ ADC?: SQR?: SQ*: [0, 19] +COMP: {} + +CRC: + _strip: CRC_ + +CRS: + _strip: CRS_ + _include: + - fields/crs/crs.yaml + +DAC: + _strip: DAC_ + +DBGMCU: + _strip: DBGMCU_ + +DTS: + _strip: DTS_ + EXTI: + _strip: EXTI_ _include: + - patches/exti/exti4_5.yaml - fields/exti/common.yaml - fields/exti/exti_priv.yaml FDCAN1: _strip: FDCAN_ -GPDMA?: +FLASH: + _strip: FLASH_ + +GPDMA1: _strip: GPDMA_ _include: - fields/dma/gpdma/h5.yaml @@ -33,7 +59,8 @@ GPDMA?: GPIOC: _strip: GPIO_ -GPIO?: +GPIO[ABCH]: + _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -55,50 +82,82 @@ GTZC1: _array: PRIV*: {} -I2C?: +HASH: + _strip: HASH_ + +I2C1: + _strip: I2C_ _include: - fields/i2c/v3.yaml I3C1: _strip: I3C_ +ICACHE: + _strip: ICACHE_ + IWDG: + _strip: IWDG_ _include: - patches/iwdg/add_onf.yaml - patches/16bit_with_mask.yaml - fields/iwdg/h5.yaml +LPTIM1: + _strip: LPTIM_ + LPUART: + _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml +OPAMP1: {} + PWR: + _strip: PWR_ _include: - fields/pwr/pwr_h5.yaml +RAMCFG: + _strip: RAMCFG_ + RCC: + _strip: RCC_ _include: - patches/rcc/h503.yaml - fields/rcc/v3/h503.yaml RNG: + _strip: RNG_ _include: - patches/rng/h503.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SBS: + _strip: SBS_ + _include: + - patches/sbs/fmplus.yaml + - patches/sbs/sbs.yaml + - fields/sbs/sbs.yaml + +SPI1: + _strip: SPI_ _include: - patches/spi/rxtxdr.yaml - fields/spi/spi_v3_base.yaml - fields/spi/spi_v3_cfg1_bpass.yaml +TAMP: + _strip: TAMP_ + TIM?: _strip: TIM?_ @@ -144,15 +203,12 @@ USART1: - fields/usart/v4/B.yaml USB: + _strip: USB_ _include: - collect/usb/chepr.yaml WWDG: + _strip: WWDG_ _include: - patches/16bit_with_mask.yaml - fields/wwdg/wwdg_v2.yaml - -_include: - - patches/h5.yaml - - fields/crs/crs.yaml - - fields/sbs/sbs.yaml diff --git a/devices/stm32h523.yaml b/devices/stm32h523.yaml index 9570ad8e7..6776c4916 100644 --- a/devices/stm32h523.yaml +++ b/devices/stm32h523.yaml @@ -1,5 +1,7 @@ _svd: ../svd/stm32h523.svd +_clear_fields: "*" + _modify: size: 0x20 GPIO?: @@ -47,7 +49,7 @@ _modify: USART_S: name: USART1_S -ADC[12]: +ADC1: _strip: ADC_ _include: - patches/adc/split.yaml @@ -63,21 +65,54 @@ ADCC: _strip: ADC_ CRC: + _strip: CRC_ _include: - patches/crc/crc_rename_init.yaml - fields/crc/crc_advanced.yaml # - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + _include: + - fields/crs/crs.yaml + +DAC: + _strip: DAC_ + +DBGMCU: + _strip: DBGMCU_ + +DCACHE: + _strip: DCACHE_ + +DCMI: + _strip: DCMI_ + +DLYBOS1: + _strip: DLYB_ + +DTS: + _strip: DTS_ + EXTI: + _strip: EXTI_ _include: + - patches/exti/exti4_5.yaml - fields/exti/common.yaml - fields/exti/exti_priv.yaml FDCAN1: _strip: FDCAN_ -GPDMA?: +FLASH: + _strip: FLASH_ + # - collect/flash/secbbr.yaml + +FMC: + _strip: FMC_ + +GPDMA1: _strip: GPDMA_ _include: - fields/dma/gpdma/h5.yaml @@ -86,7 +121,8 @@ GPDMA?: GPIOC: _strip: GPIO_ -GPIO?: +GPIO[ABCDEFGHI]: + _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -104,46 +140,89 @@ GPIO[BCDEFGHI]: GTZC1_TZIC: _strip: GTZC1_TZIC_ +GTZC1_TZSC: + _strip: GTZC1_TZSC_ + +HASH: + _strip: HASH_ + I2C?: + _strip: I2C_ _include: - fields/i2c/v3.yaml +I3C1: + _strip: I3C_ + +ICACHE: + _strip: ICACHE_ + IWDG: + _strip: IWDG_ _include: - patches/16bit_with_mask.yaml - fields/iwdg/h5.yaml -LPTIM?: +LPTIM[12]: _strip: + - LPTIM_ - LPTIM?_ LPUART: + _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml +OCTOSPI: + _strip: OCTOSPI_ + +PSSI: + _strip: PSSI_ + PWR: + _strip: PWR_ _include: - fields/pwr/pwr_h5.yaml +RAMCFG: + _strip: RAMCFG_ + RCC: + _strip: RCC_ _include: - patches/rcc/h523_h533.yaml - fields/rcc/v3/h56x_h57x.yaml +RNG: + _strip: RNG_ + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SBS: + _strip: SBS_ + _include: + - patches/sbs/sbs.yaml + +SDMMC1: + _strip: SDMMC_ + +SPI1: + _strip: SPI_ _include: - patches/spi/rxtxdr.yaml - fields/spi/spi_v3_base.yaml - fields/spi/spi_v3_cfg1_bpass.yaml +TAMP: + _strip: TAMP_ + TIM?: _strip: TIM?_ @@ -211,33 +290,18 @@ USART1: - fields/usart/v4/B.yaml USB: + _strip: USB_ _include: - collect/usb/chepr.yaml USBSRAM: _strip: USBSRAM_CHEP_ +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/16bit_with_mask.yaml - fields/wwdg/wwdg_v2.yaml - -SBS: # TODO: Dont do this, this will be undone by patches/h5.yaml - PMCR: - _modify: - PB6_FMP: - name: PB6_FMPLUS - PB7_FMP: - name: PB7_FMPLUS - PB8_FMP: - name: PB8_FMPLUS - -# todo: Once tested, apply these to the other H5 variants as applicable, or possibly -# todo place them in the common/h5.yaml -_include: - - patches/h5.yaml - - patches/h523_h533.yaml - - # - collect/flash/secbbr.yaml - - - fields/crs/crs.yaml diff --git a/devices/stm32h533.yaml b/devices/stm32h533.yaml index c71258da8..23f9ee652 100644 --- a/devices/stm32h533.yaml +++ b/devices/stm32h533.yaml @@ -1,5 +1,7 @@ _svd: ../svd/stm32h533.svd +_clear_fields: "*" + _modify: size: 0x20 GPIO?: @@ -51,7 +53,7 @@ _modify: USART_S: name: USART1_S -ADC[12]: +ADC1: _strip: ADC_ _include: - patches/adc/split.yaml @@ -66,22 +68,58 @@ ADC[12]: ADCC: _strip: ADC_ +AES: + _strip: AES_ + CRC: + _strip: CRC_ _include: - patches/crc/crc_rename_init.yaml - fields/crc/crc_advanced.yaml # - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + _include: + - fields/crs/crs.yaml + +DAC: + _strip: DAC_ + +DBGMCU: + _strip: DBGMCU_ + +DCACHE: + _strip: DCACHE_ + +DCMI: + _strip: DCMI_ + +DLYBOS1: + _strip: DLYB_ + +DTS: + _strip: DTS_ + EXTI: + _strip: EXTI_ _include: + - patches/exti/exti4_5.yaml - fields/exti/common.yaml - fields/exti/exti_priv.yaml FDCAN1: _strip: FDCAN_ -GPDMA?: +FLASH: + _strip: FLASH_ + # - collect/flash/secbbr.yaml + +FMC: + _strip: FMC_ + +GPDMA1: _strip: GPDMA_ _include: - fields/dma/gpdma/h5.yaml @@ -90,7 +128,8 @@ GPDMA?: GPIOC: _strip: GPIO_ -GPIO?: +GPIO[ABCDEFGHI]: + _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -108,46 +147,98 @@ GPIO[BCDEFGHI]: GTZC1_TZIC: _strip: GTZC1_TZIC_ -I2C?: +GTZC1_TZSC: + _strip: GTZC1_TZSC_ + +HASH: + _strip: HASH_ + +I2C1: + _strip: I2C_ _include: - fields/i2c/v3.yaml +I3C1: + _strip: I3C_ + +ICACHE: + _strip: ICACHE_ + IWDG: + _strip: IWDG_ _include: - patches/16bit_with_mask.yaml - fields/iwdg/h5.yaml -LPTIM?: +LPTIM[12]: _strip: + - LPTIM_ - LPTIM?_ LPUART: + _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml +OCTOSPI: + _strip: OCTOSPI_ + +OTFDEC1: + _strip: OTFDEC_ + +PKA: + _strip: PKA_ + +PSSI: + _strip: PSSI_ + PWR: + _strip: PWR_ _include: - fields/pwr/pwr_h5.yaml +RAMCFG: + _strip: RAMCFG_ + RCC: + _strip: RCC_ _include: - patches/rcc/h523_h533.yaml - fields/rcc/v3/h56x_h57x.yaml +RNG: + _strip: RNG_ + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SAES: + _strip: SAES_ + +SBS: + _strip: SBS_ + _include: + - patches/sbs/sbs.yaml + +SDMMC1: + _strip: SDMMC_ + +SPI1: + _strip: SPI_ _include: - patches/spi/rxtxdr.yaml - fields/spi/spi_v3_base.yaml - fields/spi/spi_v3_cfg1_bpass.yaml +TAMP: + _strip: TAMP_ + TIM?: _strip: TIM?_ @@ -215,34 +306,18 @@ USART1: - fields/usart/v4/B.yaml USB: + _strip: USB_ _include: - collect/usb/chepr.yaml USBSRAM: _strip: USBSRAM_CHEP_ +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/16bit_with_mask.yaml - fields/wwdg/wwdg_v2.yaml - -SBS: # TODO: Dont do this, this will be undone by patches/h5.yaml - PMCR: - _modify: - PB6_FMP: - name: PB6_FMPLUS - PB7_FMP: - name: PB7_FMPLUS - PB8_FMP: - name: PB8_FMPLUS - -# todo: Once tested, apply these to the other H5 variants as applicable, or possibly -# todo place them in the common/h5.yaml -_include: - - patches/h5.yaml - - patches/h523_h533.yaml - - patches/h5_security.yaml - - # - collect/flash/secbbr.yaml - - - fields/crs/crs.yaml diff --git a/devices/stm32h562.yaml b/devices/stm32h562.yaml index 1c3a55733..948968f94 100644 --- a/devices/stm32h562.yaml +++ b/devices/stm32h562.yaml @@ -1,6 +1,8 @@ _svd: ../svd/stm32h562.svd -ADC[12]: +_clear_fields: "*" + +ADC1: _strip: ADC_ _include: - patches/adc/split.yaml @@ -15,22 +17,61 @@ ADC[12]: ADCC: _strip: ADC_ +CORDIC: + _strip: CORDIC_ + CRC: + _strip: CRC_ _include: - patches/crc/crc_rename_init.yaml - fields/crc/crc_advanced.yaml # - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + _include: + - fields/crs/crs.yaml + +DAC: + _strip: DAC_ + +DBGMCU: + _strip: DBGMCU_ + +DCACHE: + _strip: DCACHE_ + +DCMI: + _strip: DCMI_ + +DLYBOS1: + _strip: DLYB_ + +DTS: + _strip: DTS_ + EXTI: + _strip: EXTI_ _include: + - patches/exti/exti4_5.yaml - fields/exti/common.yaml - fields/exti/exti_priv.yaml FDCAN1: _strip: FDCAN_ -GPDMA?: +FLASH: + _strip: FLASH_ + # - collect/flash/secbbr.yaml + +FMAC: + _strip: FMAC_ + +FMC: + _strip: FMC_ + +GPDMA1: _strip: GPDMA_ _include: - fields/dma/gpdma/h5.yaml @@ -39,7 +80,8 @@ GPDMA?: GPIOC: _strip: GPIO_ -GPIO?: +GPIO[ABCHI]: + _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -49,7 +91,7 @@ GPIO[A]: GPIO[BCHI]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[123]: _strip: GTZC1_MPCBB?_ _include: - collect/gtzc/h5_u5.yaml @@ -57,47 +99,94 @@ GTZC1_MPCBB?: GTZC1_TZIC: _strip: GTZC1_TZIC_ -I2C?: +GTZC1_TZSC: + _strip: GTZC1_TZSC_ + +HASH: + _strip: HASH_ + +I2C1: + _strip: I2C_ _include: - fields/i2c/v3.yaml +I3C: + _strip: I3C_ + +ICACHE: + _strip: ICACHE_ + IWDG: + _strip: IWDG_ _include: - patches/iwdg/add_onf.yaml - patches/16bit_with_mask.yaml - fields/iwdg/h5.yaml +LPTIM1: + _strip: LPTIM_ + LPUART: + _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml +OCTOSPI: + _strip: OCTOSPI_ + +PSSI: + _strip: PSSI_ + PWR: + _strip: PWR_ _include: - fields/pwr/pwr_h5.yaml +RAMCFG: + _strip: RAMCFG_ + RCC: + _strip: RCC_ _include: - patches/rcc/h56x_h57x.yaml - fields/rcc/v3/h56x_h57x.yaml +RNG: + _strip: RNG_ + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SAI?: +SAI1: + _strip: SAI_ _include: - fields/sai/sai.yaml -SPI?: +SBS: + _strip: SBS_ + _include: + - patches/sbs/fmplus.yaml + - patches/sbs/sbs.yaml + +SDMMC1: + _strip: SDMMC_ + +SPI1: + _strip: SPI_ _include: - patches/spi/rxtxdr.yaml - fields/spi/spi_v3_base.yaml - fields/spi/spi_v3_cfg1_bpass.yaml +TAMP: + _strip: TAMP_ + TIM?: _strip: TIM?_ @@ -181,20 +270,15 @@ USART1: - fields/usart/v4/B.yaml USB: + _strip: USB_ _include: - collect/usb/chepr.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/16bit_with_mask.yaml - fields/wwdg/wwdg_v2.yaml - -# todo: Once tested, apply these to the other H5 variants as applicable, or possibly -# todo place them in the common/h5.yaml -_include: - - patches/h5.yaml - - patches/h56x_h57x.yaml - - # - collect/flash/secbbr.yaml - - - fields/crs/crs.yaml diff --git a/devices/stm32h563.yaml b/devices/stm32h563.yaml index 4d80abd37..67261de30 100644 --- a/devices/stm32h563.yaml +++ b/devices/stm32h563.yaml @@ -1,6 +1,8 @@ _svd: ../svd/stm32h563.svd -ADC[12]: +_clear_fields: "*" + +ADC1: _strip: ADC_ _include: - patches/adc/split.yaml @@ -15,25 +17,64 @@ ADC[12]: ADCC: _strip: ADC_ +CORDIC: + _strip: CORDIC_ + CRC: + _strip: CRC_ _include: - patches/crc/crc_rename_init.yaml - fields/crc/crc_advanced.yaml # - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + _include: + - fields/crs/crs.yaml + +DAC: + _strip: DAC_ + +DBGMCU: + _strip: DBGMCU_ + +DCACHE: + _strip: DCACHE_ + +DCMI: + _strip: DCMI_ + +DLYBOS1: + _strip: DLYB_ + +DTS: + _strip: DTS_ + ETH: _strip: ETH_ EXTI: + _strip: EXTI_ _include: + - patches/exti/exti4_5.yaml - fields/exti/common.yaml - fields/exti/exti_priv.yaml FDCAN1: _strip: FDCAN_ -GPDMA?: +FLASH: + _strip: FLASH_ + # - collect/flash/secbbr.yaml + +FMAC: + _strip: FMAC_ + +FMC: + _strip: FMC_ + +GPDMA1: _strip: GPDMA_ _include: - fields/dma/gpdma/h5.yaml @@ -42,7 +83,8 @@ GPDMA?: GPIOC: _strip: GPIO_ -GPIO?: +GPIO[ABCHI]: + _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -52,7 +94,7 @@ GPIO[A]: GPIO[BCHI]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[123]: _strip: GTZC1_MPCBB?_ _include: - collect/gtzc/h5_u5.yaml @@ -60,47 +102,94 @@ GTZC1_MPCBB?: GTZC1_TZIC: _strip: GTZC1_TZIC_ -I2C?: +GTZC1_TZSC: + _strip: GTZC1_TZSC_ + +HASH: + _strip: HASH_ + +I2C1: + _strip: I2C_ _include: - fields/i2c/v3.yaml +I3C: + _strip: I3C_ + +ICACHE: + _strip: ICACHE_ + IWDG: + _strip: IWDG_ _include: - patches/iwdg/add_onf.yaml - patches/16bit_with_mask.yaml - fields/iwdg/h5.yaml +LPTIM1: + _strip: LPTIM_ + LPUART: + _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml +OCTOSPI: + _strip: OCTOSPI_ + +PSSI: + _strip: PSSI_ + PWR: + _strip: PWR_ _include: - fields/pwr/pwr_h5.yaml +RAMCFG: + _strip: RAMCFG_ + RCC: + _strip: RCC_ _include: - patches/rcc/h56x_h57x.yaml - fields/rcc/v3/h56x_h57x.yaml +RNG: + _strip: RNG_ + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SAI?: +SAI1: + _strip: SAI_ _include: - fields/sai/sai.yaml -SPI?: +SBS: + _strip: SBS_ + _include: + - patches/sbs/fmplus.yaml + - patches/sbs/sbs.yaml + +SDMMC1: + _strip: SDMMC_ + +SPI1: + _strip: SPI_ _include: - patches/spi/rxtxdr.yaml - fields/spi/spi_v3_base.yaml - fields/spi/spi_v3_cfg1_bpass.yaml +TAMP: + _strip: TAMP_ + TIM?: _strip: TIM?_ @@ -184,18 +273,15 @@ USART1: - fields/usart/v4/B.yaml USB: + _strip: USB_ _include: - collect/usb/chepr.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/16bit_with_mask.yaml - fields/wwdg/wwdg_v2.yaml - -_include: - - patches/h5.yaml - - patches/h56x_h57x.yaml - - # - collect/flash/secbbr.yaml - - - fields/crs/crs.yaml diff --git a/devices/stm32h573.yaml b/devices/stm32h573.yaml index 78bf8f3bf..0df3c5983 100644 --- a/devices/stm32h573.yaml +++ b/devices/stm32h573.yaml @@ -1,6 +1,8 @@ _svd: ../svd/stm32h573.svd -ADC[12]: +_clear_fields: "*" + +ADC1: _strip: ADC_ _include: - patches/adc/split.yaml @@ -16,28 +18,68 @@ ADCC: _strip: ADC_ AES: + _strip: AES_ _include: - fields/aes/v3.yaml +CORDIC: + _strip: CORDIC_ + CRC: + _strip: CRC_ _include: - patches/crc/crc_rename_init.yaml - fields/crc/crc_advanced.yaml # - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + _include: + - fields/crs/crs.yaml + +DAC: + _strip: DAC_ + +DBGMCU: + _strip: DBGMCU_ + +DCACHE: + _strip: DCACHE_ + +DCMI: + _strip: DCMI_ + +DLYBOS1: + _strip: DLYB_ + +DTS: + _strip: DTS_ + ETH: _strip: ETH_ EXTI: + _strip: EXTI_ _include: + - patches/exti/exti4_5.yaml - fields/exti/common.yaml - fields/exti/exti_priv.yaml FDCAN1: _strip: FDCAN_ + # - collect/flash/secbbr.yaml + +FLASH: + _strip: FLASH_ + +FMAC: + _strip: FMAC_ + +FMC: + _strip: FMC_ -GPDMA?: +GPDMA1: _strip: GPDMA_ _include: - fields/dma/gpdma/h5.yaml @@ -46,7 +88,8 @@ GPDMA?: GPIOC: _strip: GPIO_ -GPIO?: +GPIO[ABCHI]: + _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -56,7 +99,7 @@ GPIO[A]: GPIO[BCHI]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[123]: _strip: GTZC1_MPCBB?_ _include: - collect/gtzc/h5_u5.yaml @@ -64,47 +107,103 @@ GTZC1_MPCBB?: GTZC1_TZIC: _strip: GTZC1_TZIC_ -I2C?: +GTZC1_TZSC: + _strip: GTZC1_TZSC_ + +HASH: + _strip: HASH_ + +I2C1: + _strip: I2C_ _include: - fields/i2c/v3.yaml +I3C: + _strip: I3C_ + +ICACHE: + _strip: ICACHE_ + IWDG: + _strip: IWDG_ _include: - patches/iwdg/add_onf.yaml - patches/16bit_with_mask.yaml - fields/iwdg/h5.yaml +LPTIM1: + _strip: LPTIM_ + LPUART: + _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml +OCTOSPI: + _strip: OCTOSPI_ + +OTFDEC1: + _strip: OTFDEC_ + +PKA: + _strip: PKA_ + +PSSI: + _strip: PSSI_ + PWR: + _strip: PWR_ _include: - fields/pwr/pwr_h5.yaml +RAMCFG: + _strip: RAMCFG_ + RCC: + _strip: RCC_ _include: - patches/rcc/h56x_h57x.yaml - fields/rcc/v3/h56x_h57x.yaml +RNG: + _strip: RNG_ + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SAI?: +SAES: + _strip: SAES_ + +SAI1: + _strip: SAI_ _include: - fields/sai/sai.yaml -SPI?: +SBS: + _strip: SBS_ + _include: + - patches/sbs/fmplus.yaml + - patches/sbs/sbs.yaml + +SDMMC1: + _strip: SDMMC_ + +SPI1: + _strip: SPI_ _include: - patches/spi/rxtxdr.yaml - fields/spi/spi_v3_base.yaml - fields/spi/spi_v3_cfg1_bpass.yaml +TAMP: + _strip: TAMP_ + TIM?: _strip: TIM?_ @@ -188,19 +287,15 @@ USART1: - fields/usart/v4/B.yaml USB: + _strip: USB_ _include: - collect/usb/chepr.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/16bit_with_mask.yaml - fields/wwdg/wwdg_v2.yaml - -_include: - - patches/h5.yaml - - patches/h56x_h57x.yaml - - patches/h5_security.yaml - - # - collect/flash/secbbr.yaml - - - fields/crs/crs.yaml From c8e9ab03dbd6261258ecf79a9bb8f078df163a1c Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Thu, 6 Feb 2025 13:33:48 +0300 Subject: [PATCH 08/13] L0 --- devices/fields/dbg/dbg_l0.yaml | 67 +++++----- devices/fields/pwr/pwr_l0.yaml | 205 +++++++++++++++---------------- devices/patches/firewall/l0.yaml | 8 -- devices/stm32l0x0.yaml | 20 +-- devices/stm32l0x1.yaml | 20 +-- devices/stm32l0x2.yaml | 24 ++-- devices/stm32l0x3.yaml | 26 ++-- 7 files changed, 197 insertions(+), 173 deletions(-) delete mode 100644 devices/patches/firewall/l0.yaml diff --git a/devices/fields/dbg/dbg_l0.yaml b/devices/fields/dbg/dbg_l0.yaml index f64dcedd3..b4e2f523d 100644 --- a/devices/fields/dbg/dbg_l0.yaml +++ b/devices/fields/dbg/dbg_l0.yaml @@ -1,36 +1,35 @@ # Debug registers for L0 -DBG: - CR: - DBG_STANDBY: - Disabled: [0, Debug Standby Mode Disabled] - Enabled: [1, Debug Standby Mode Enabled] - DBG_STOP: - Disabled: [0, Debug Stop Mode Disabled] - Enabled: [1, Debug Stop Mode Enabled] - DBG_SLEEP: - Disabled: [0, Debug Sleep Mode Disabled] - Enabled: [1, Debug Sleep Mode Enabled] - APB1_FZ: - DBG_LPTIMER_STOP: - Continue: [0, LPTIM1 counter clock is fed even if the core is halted] - Stop: [1, LPTIM1 counter clock is stopped when the core is halted] - DBG_I2C*_STOP: - NormalMode: [0, Same behavior as in normal mode] - SMBusTimeoutFrozen: [1, I2C3 SMBUS timeout is frozen] - DBG_IWDG_STOP: - Continue: [0, The independent watchdog counter clock continues even if the core is halted] - Stop: [1, The independent watchdog counter clock is stopped when the core is halted] - DBG_WWDG_STOP: - Continue: [0, The window watchdog counter clock continues even if the core is halted] - Stop: [1, The window watchdog counter clock is stopped when the core is halted] - DBG_RTC_STOP: - Continue: [0, The clock of the RTC counter is fed even if the core is halted] - Stop: [1, The clock of the RTC counter is stopped when the core is halted] - DBG_TIM*_STOP: - Continue: [0, The counter clock of TIMx is fed even if the core is halted] - Stop: [1, The counter clock of TIMx is stopped when the core is halted] - APB2_FZ: - DBG_TIM*_STOP: - Continue: [0, The counter clock of TIMx is fed even if the core is halted] - Stop: [1, The counter clock of TIMx is stopped when the core is halted] +CR: + DBG_STANDBY: + Disabled: [0, Debug Standby Mode Disabled] + Enabled: [1, Debug Standby Mode Enabled] + DBG_STOP: + Disabled: [0, Debug Stop Mode Disabled] + Enabled: [1, Debug Stop Mode Enabled] + DBG_SLEEP: + Disabled: [0, Debug Sleep Mode Disabled] + Enabled: [1, Debug Sleep Mode Enabled] +APB1_FZ: + DBG_LPTIMER_STOP: + Continue: [0, LPTIM1 counter clock is fed even if the core is halted] + Stop: [1, LPTIM1 counter clock is stopped when the core is halted] + DBG_I2C*_STOP: + NormalMode: [0, Same behavior as in normal mode] + SMBusTimeoutFrozen: [1, I2C3 SMBUS timeout is frozen] + DBG_IWDG_STOP: + Continue: [0, The independent watchdog counter clock continues even if the core is halted] + Stop: [1, The independent watchdog counter clock is stopped when the core is halted] + DBG_WWDG_STOP: + Continue: [0, The window watchdog counter clock continues even if the core is halted] + Stop: [1, The window watchdog counter clock is stopped when the core is halted] + DBG_RTC_STOP: + Continue: [0, The clock of the RTC counter is fed even if the core is halted] + Stop: [1, The clock of the RTC counter is stopped when the core is halted] + DBG_TIM*_STOP: + Continue: [0, The counter clock of TIMx is fed even if the core is halted] + Stop: [1, The counter clock of TIMx is stopped when the core is halted] +APB2_FZ: + DBG_TIM*_STOP: + Continue: [0, The counter clock of TIMx is fed even if the core is halted] + Stop: [1, The counter clock of TIMx is stopped when the core is halted] diff --git a/devices/fields/pwr/pwr_l0.yaml b/devices/fields/pwr/pwr_l0.yaml index bb8078e00..5e7af631d 100644 --- a/devices/fields/pwr/pwr_l0.yaml +++ b/devices/fields/pwr/pwr_l0.yaml @@ -1,109 +1,108 @@ # Power Controller for L0 Family -PWR: - _include: - - pwr_v1.yaml +_include: + - pwr_v1.yaml - CR: - LPRUN: - MAIN_MODE: [0, Voltage regulator in Main mode in Low-power run mode] - LOW_POWER_MODE: [1, Voltage regulator in low-power mode in Low-power run mode] - DS_EE_KOFF: - NVMWakeUp: [0, NVM woken up when exiting from Deepsleep mode even if the bit RUN_PD is set] - NVMSleep: [1, NVM not woken up when exiting from low-power mode (if the bit RUN_PD is set)] - VOS: - V1_8: [1, 1.8 V (range 1)] - V1_5: [2, 1.5 V (range 2)] - V1_2: [3, 1.2 V (range 3)] - FWU: - Disabled: [0, Low-power modes exit occurs only when VREFINT is ready] - Enabled: [1, VREFINT start up time is ignored when exiting low-power modes] - ULP: - Enabled: [0, VREFINT is on in low-power mode] - Disabled: [1, VREFINT is off in low-power mode] - DBP: - Disabled: [0, "Access to RTC, RTC Backup and RCC CSR registers disabled"] - Enabled: [1, "Access to RTC, RTC Backup and RCC CSR registers enabled"] - "?~PLS": - V1_9: [0, 1.9 V] - V2_1: [1, 2.1 V] - V2_3: [2, 2.3 V] - V2_5: [3, 2.5 V] - V2_7: [4, 2.7 V] - V2_9: [5, 2.9 V] - V3_1: [6, 3.1 V] - External: [7, External input analog voltage (Compare internally to VREFINT)] - "?~PVDE": - Disabled: [0, PVD Disabled] - Enabled: [1, PVD Enabled] - CSBF: - _write: - Clear: [1, Clear the SBF Standby flag] - CWUF: - _write: - Clear: [1, Clear the WUF Wakeup flag after 2 system clock cycles] - LPSDSR: - MAIN_MODE: [0, Voltage regulator on during Deepsleep/Sleep/Low-power run mode] - LOW_POWER_MODE: [1, Voltage regulator in low-power mode during Deepsleep/Sleep/Low-power run mode] - CSR: - EWUP3: - Disabled: - [ - 0, - WKUP pin 3 is used for general purpose I/Os. An event on the WKUP pin 3 does not wakeup the device from Standby mode, - ] - Enabled: - [ - 1, - WKUP pin 3 is used for wakeup from Standby mode and forced in input pull down configuration (rising edge on WKUP pin 3wakes-up the system from Standby mode), - ] - EWUP2: - Disabled: - [ - 0, - WKUP pin 2 is used for general purpose I/Os. An event on the WKUP pin 2 does not wakeup the device from Standby mode, - ] - Enabled: - [ - 1, - WKUP pin 2 is used for wakeup from Standby mode and forced in input pull down configuration (rising edge on WKUP pin 2 wakes-up the system from Standby mode), - ] - EWUP1: - Disabled: - [ - 0, - WKUP pin 1 is used for general purpose I/Os. An event on the WKUP pin 1 does not wakeup the device from Standby mode, - ] - Enabled: +CR: + LPRUN: + MAIN_MODE: [0, Voltage regulator in Main mode in Low-power run mode] + LOW_POWER_MODE: [1, Voltage regulator in low-power mode in Low-power run mode] + DS_EE_KOFF: + NVMWakeUp: [0, NVM woken up when exiting from Deepsleep mode even if the bit RUN_PD is set] + NVMSleep: [1, NVM not woken up when exiting from low-power mode (if the bit RUN_PD is set)] + VOS: + V1_8: [1, 1.8 V (range 1)] + V1_5: [2, 1.5 V (range 2)] + V1_2: [3, 1.2 V (range 3)] + FWU: + Disabled: [0, Low-power modes exit occurs only when VREFINT is ready] + Enabled: [1, VREFINT start up time is ignored when exiting low-power modes] + ULP: + Enabled: [0, VREFINT is on in low-power mode] + Disabled: [1, VREFINT is off in low-power mode] + DBP: + Disabled: [0, "Access to RTC, RTC Backup and RCC CSR registers disabled"] + Enabled: [1, "Access to RTC, RTC Backup and RCC CSR registers enabled"] + "?~PLS": + V1_9: [0, 1.9 V] + V2_1: [1, 2.1 V] + V2_3: [2, 2.3 V] + V2_5: [3, 2.5 V] + V2_7: [4, 2.7 V] + V2_9: [5, 2.9 V] + V3_1: [6, 3.1 V] + External: [7, External input analog voltage (Compare internally to VREFINT)] + "?~PVDE": + Disabled: [0, PVD Disabled] + Enabled: [1, PVD Enabled] + CSBF: + _write: + Clear: [1, Clear the SBF Standby flag] + CWUF: + _write: + Clear: [1, Clear the WUF Wakeup flag after 2 system clock cycles] + LPSDSR: + MAIN_MODE: [0, Voltage regulator on during Deepsleep/Sleep/Low-power run mode] + LOW_POWER_MODE: [1, Voltage regulator in low-power mode during Deepsleep/Sleep/Low-power run mode] +CSR: + EWUP3: + Disabled: + [ + 0, + WKUP pin 3 is used for general purpose I/Os. An event on the WKUP pin 3 does not wakeup the device from Standby mode, + ] + Enabled: + [ + 1, + WKUP pin 3 is used for wakeup from Standby mode and forced in input pull down configuration (rising edge on WKUP pin 3wakes-up the system from Standby mode), + ] + EWUP2: + Disabled: + [ + 0, + WKUP pin 2 is used for general purpose I/Os. An event on the WKUP pin 2 does not wakeup the device from Standby mode, + ] + Enabled: + [ + 1, + WKUP pin 2 is used for wakeup from Standby mode and forced in input pull down configuration (rising edge on WKUP pin 2 wakes-up the system from Standby mode), + ] + EWUP1: + Disabled: + [ + 0, + WKUP pin 1 is used for general purpose I/Os. An event on the WKUP pin 1 does not wakeup the device from Standby mode, + ] + Enabled: + [ + 1, + WKUP pin 1 is used for wakeup from Standby mode and forced in input pull down configuration (rising edge on WKUP pin 1 wakes-up the system from Standby mode), + ] + REGLPF: + _read: + Ready: [0, Regulator is ready in Main mode] + NotReady: [1, Regulator voltage is in low-power mode] + VOSF: + _read: + Ready: [0, Regulator is ready in the selected voltage range] + NotReady: [1, Regulator voltage output is changing to the required VOS level] + VREFINTRDYF: + _read: + NotReady: [0, VREFINT is OFF] + Ready: [1, VREFINT is ready] + "?~PVDO": + _read: + AboveThreshold: [0, "VDD is higher than the PVD threshold selected with the PLS[2:0] bits"] + BelowThreshold: [1, "VDD is lower than the PVD threshold selected with the PLS[2:0] bits"] + SBF: + _read: + NoStandbyEvent: [0, Device has not been in Standby mode] + StandbyEvent: [1, Device has been in Standby mode] + WUF: + _read: + NoWakeupEvent: [0, No wakeup event occurred] + WakeupEvent: [ 1, - WKUP pin 1 is used for wakeup from Standby mode and forced in input pull down configuration (rising edge on WKUP pin 1 wakes-up the system from Standby mode), + "A wakeup event was received from the WKUP pin or from the RTC alarm (Alarm A or Alarm B), RTC Tamper event, RTC TimeStamp event or RTC Wakeup)", ] - REGLPF: - _read: - Ready: [0, Regulator is ready in Main mode] - NotReady: [1, Regulator voltage is in low-power mode] - VOSF: - _read: - Ready: [0, Regulator is ready in the selected voltage range] - NotReady: [1, Regulator voltage output is changing to the required VOS level] - VREFINTRDYF: - _read: - NotReady: [0, VREFINT is OFF] - Ready: [1, VREFINT is ready] - "?~PVDO": - _read: - AboveThreshold: [0, "VDD is higher than the PVD threshold selected with the PLS[2:0] bits"] - BelowThreshold: [1, "VDD is lower than the PVD threshold selected with the PLS[2:0] bits"] - SBF: - _read: - NoStandbyEvent: [0, Device has not been in Standby mode] - StandbyEvent: [1, Device has been in Standby mode] - WUF: - _read: - NoWakeupEvent: [0, No wakeup event occurred] - WakeupEvent: - [ - 1, - "A wakeup event was received from the WKUP pin or from the RTC alarm (Alarm A or Alarm B), RTC Tamper event, RTC TimeStamp event or RTC Wakeup)", - ] diff --git a/devices/patches/firewall/l0.yaml b/devices/patches/firewall/l0.yaml deleted file mode 100644 index ea2e57fb3..000000000 --- a/devices/patches/firewall/l0.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Renames the stm32l0xx firewall to "FW" and removes register prefixes - -_modify: - Firewall: - name: FW - -FW: - _strip: FIREWALL_ diff --git a/devices/stm32l0x0.yaml b/devices/stm32l0x0.yaml index 5a215c52f..c73d43e3c 100644 --- a/devices/stm32l0x0.yaml +++ b/devices/stm32l0x0.yaml @@ -8,6 +8,8 @@ _delete: _modify: Flash: name: FLASH + Firewall: + name: FW ADC: _include: @@ -30,7 +32,11 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml -DMA?: +DBG: + _include: + - fields/dbg/dbg_l0.yaml + +DMA1: _include: - fields/dma/dma_v1_with_remapping.yaml - collect/dma/v1.yaml @@ -44,10 +50,11 @@ FLASH: - fields/flash/flash_l0.yaml FW: + _strip: FIREWALL_ _include: - fields/fw/fw_l0_l4.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2r.yaml @@ -57,7 +64,7 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2r_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -79,6 +86,8 @@ LPUART1: - fields/usart/v3/lp_A.yaml PWR: + _include: + - fields/pwr/pwr_l0.yaml CR: # LPDS only exists in the L0x0 family LPDS: @@ -126,7 +135,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -182,9 +191,6 @@ WWDG: - fields/wwdg/wwdg.yaml _include: - - patches/firewall/l0.yaml - patches/nvic/l0_prio_bits.yaml - - fields/dbg/dbg_l0.yaml - fields/nvic/nvic_v1.yaml - - fields/pwr/pwr_l0.yaml - patches/tim/group.yaml diff --git a/devices/stm32l0x1.yaml b/devices/stm32l0x1.yaml index e8749b89c..a8e5ecb35 100644 --- a/devices/stm32l0x1.yaml +++ b/devices/stm32l0x1.yaml @@ -10,6 +10,8 @@ _modify: name: FLASH SYSCFG_COMP: name: SYSCFG + Firewall: + name: FW ADC: _include: @@ -42,7 +44,11 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml -DMA?: +DBG: + _include: + - fields/dbg/dbg_l0.yaml + +DMA1: _include: - fields/dma/dma_v1_with_remapping.yaml - collect/dma/v1.yaml @@ -57,10 +63,11 @@ FLASH: - fields/flash/flash_l0.yaml FW: + _strip: FIREWALL_ _include: - fields/fw/fw_l0_l4.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2r.yaml @@ -70,7 +77,7 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2r_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -92,6 +99,8 @@ LPUART1: - fields/usart/v3/lp_A.yaml PWR: + _include: + - fields/pwr/pwr_l0.yaml CR: # LPDS only exists in the L0x1 family LPDS: @@ -145,7 +154,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -207,9 +216,6 @@ WWDG: - fields/wwdg/wwdg.yaml _include: - - patches/firewall/l0.yaml - patches/nvic/l0_prio_bits.yaml - - fields/dbg/dbg_l0.yaml - fields/nvic/nvic_v1.yaml - - fields/pwr/pwr_l0.yaml - patches/tim/group.yaml diff --git a/devices/stm32l0x2.yaml b/devices/stm32l0x2.yaml index 461249edc..456826e59 100644 --- a/devices/stm32l0x2.yaml +++ b/devices/stm32l0x2.yaml @@ -10,6 +10,8 @@ _modify: name: FLASH SYSCFG_COMP: name: SYSCFG + Firewall: + name: FW _delete: - USB_SRAM @@ -40,12 +42,18 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - fields/dac/dac_common_1ch.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBG: + _include: + - fields/dbg/dbg_l0.yaml + +DMA1: _include: - fields/dma/dma_v1_with_remapping.yaml - collect/dma/v1.yaml @@ -60,10 +68,11 @@ FLASH: - fields/flash/flash_l0.yaml FW: + _strip: FIREWALL_ _include: - fields/fw/fw_l0_l4.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2r.yaml @@ -73,7 +82,7 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2r_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -97,6 +106,10 @@ LPUART1: MPU: _strip: MPU_ +PWR: + _include: + - fields/pwr/pwr_l0.yaml + RCC: _modify: CICR: @@ -137,7 +150,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -215,9 +228,6 @@ WWDG: - fields/wwdg/wwdg.yaml _include: - - patches/firewall/l0.yaml - patches/nvic/l0_prio_bits.yaml - patches/usb/rename_USB_FS_peripheral_to_USB.yaml - - fields/dbg/dbg_l0.yaml - - fields/pwr/pwr_l0.yaml - patches/tim/group.yaml diff --git a/devices/stm32l0x3.yaml b/devices/stm32l0x3.yaml index c1d8476b8..331f389ba 100644 --- a/devices/stm32l0x3.yaml +++ b/devices/stm32l0x3.yaml @@ -10,6 +10,8 @@ _modify: name: FLASH SYSCFG_COMP: name: SYSCFG + Firewall: + name: FW _delete: - USB_SRAM @@ -51,12 +53,18 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - fields/dac/dac_common_1ch.yaml - fields/dac/dac_dmaudr.yaml -DMA?: +DBG: + _include: + - fields/dbg/dbg_l0.yaml + +DMA1: _include: - fields/dma/dma_v1_with_remapping.yaml - collect/dma/v1.yaml @@ -71,10 +79,11 @@ FLASH: - fields/flash/flash_l0.yaml FW: + _strip: FIREWALL_ _include: - fields/fw/fw_l0_l4.yaml -GPIO?: +GPIO[AB]: _include: - fields/gpio/gpio_g0_l0.yaml - collect/gpio/v2r.yaml @@ -84,7 +93,7 @@ GPIO[A]: GPIO[B]: _include: collect/gpio/v2r_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -113,6 +122,10 @@ LPUART1: MPU: _strip: MPU_ +PWR: + _include: + - fields/pwr/pwr_l0.yaml + RCC: _modify: CICR: @@ -147,6 +160,8 @@ RCC: - fields/rcc/rcc_l0_l1_common.yaml - fields/rcc/rcc_l0.yaml +RNG: {} + RTC: _include: - patches/rtc/l0.yaml @@ -156,7 +171,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -234,9 +249,6 @@ WWDG: - fields/wwdg/wwdg.yaml _include: - - patches/firewall/l0.yaml - patches/nvic/l0_prio_bits.yaml - patches/usb/rename_USB_FS_peripheral_to_USB.yaml - - fields/dbg/dbg_l0.yaml - - fields/pwr/pwr_l0.yaml - patches/tim/group.yaml From d3ab4bade2d788f5ab97d22e830dcb1b7fecbaad Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Thu, 6 Feb 2025 14:00:10 +0300 Subject: [PATCH 09/13] L1 --- devices/stm32l100.yaml | 32 ++++++++++++++++++++++++-------- devices/stm32l151.yaml | 24 +++++++++++++++++++++--- devices/stm32l152.yaml | 24 +++++++++++++++++++++--- devices/stm32l162.yaml | 24 +++++++++++++++++++++--- 4 files changed, 87 insertions(+), 17 deletions(-) diff --git a/devices/stm32l100.yaml b/devices/stm32l100.yaml index d3b377f41..eea4c003c 100644 --- a/devices/stm32l100.yaml +++ b/devices/stm32l100.yaml @@ -10,6 +10,8 @@ AES: - patches/aes/fields.yaml - fields/aes/v1.yaml +COMP: {} + CRC: DR: # The SVD calls the DR field "Data_register" @@ -31,11 +33,9 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml -FSMC: - _include: - - patches/fsmc/fsmc_sramfix_common.yaml - - fields/fsmc/fsmc_sram.yaml - - collect/fsmc/sram.yaml +DBGMCU: {} + +DMA1: {} EXTI: _include: @@ -43,7 +43,15 @@ EXTI: - fields/exti/common.yaml - collect/exti/farray.yaml -GPIO?: +Flash: {} + +FSMC: + _include: + - patches/fsmc/fsmc_sramfix_common.yaml + - fields/fsmc/fsmc_sram.yaml + - collect/fsmc/sram.yaml + +GPIO[ABC]: _include: - patches/gpio/with_OSPEEDER.yaml - fields/gpio/v2/common.yaml @@ -54,7 +62,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -72,6 +80,8 @@ LCD: _include: - patches/lcd/ram_segment_40.yaml +OPAMP: {} + PWR: _include: - fields/pwr/pwr_v1.yaml @@ -126,6 +136,8 @@ RCC: - fields/rcc/rcc_l0_l1_common.yaml - fields/rcc/rcc_l1.yaml +RI: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -134,12 +146,16 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SDIO: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml - fields/spi/spi_v1.yaml +SYSCFG: {} + TIM2: _include: - patches/tim/rename_TIM2_CCR3_CCR3.yaml diff --git a/devices/stm32l151.yaml b/devices/stm32l151.yaml index 050047ad5..d9245077a 100644 --- a/devices/stm32l151.yaml +++ b/devices/stm32l151.yaml @@ -10,6 +10,8 @@ AES: - patches/aes/fields.yaml - fields/aes/v1.yaml +COMP: {} + CRC: DR: # The SVD calls the DR field "Data_register" @@ -31,19 +33,25 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml +DBGMCU: {} + +DMA1: {} + EXTI: _include: - patches/exti/split.yaml - fields/exti/common.yaml - collect/exti/farray.yaml +Flash: {} + FSMC: _include: - patches/fsmc/fsmc_sramfix_common.yaml - fields/fsmc/fsmc_sram.yaml - collect/fsmc/sram.yaml -GPIO?: +GPIO[ABC]: _include: - patches/gpio/with_OSPEEDER.yaml - fields/gpio/v2/common.yaml @@ -54,7 +62,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -72,10 +80,16 @@ LCD: _include: - patches/lcd/ram_segment_40.yaml +OPAMP: {} + PWR: _include: - fields/pwr/pwr_v1.yaml +RCC: {} + +RI: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -84,11 +98,15 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SDIO: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TIM2: _include: - patches/tim/rename_TIM2_CCR3_CCR3.yaml diff --git a/devices/stm32l152.yaml b/devices/stm32l152.yaml index 01fde9e29..5a8463656 100644 --- a/devices/stm32l152.yaml +++ b/devices/stm32l152.yaml @@ -10,6 +10,8 @@ AES: - patches/aes/fields.yaml - fields/aes/v1.yaml +COMP: {} + CRC: DR: # The SVD calls the DR field "Data_register" @@ -31,19 +33,25 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml +DBGMCU: {} + +DMA1: {} + EXTI: _include: - patches/exti/split.yaml - fields/exti/common.yaml - collect/exti/farray.yaml +Flash: {} + FSMC: _include: - patches/fsmc/fsmc_sramfix_common.yaml - fields/fsmc/fsmc_sram.yaml - collect/fsmc/sram.yaml -GPIO?: +GPIO[ABC]: _include: - patches/gpio/with_OSPEEDER.yaml - fields/gpio/v2/common.yaml @@ -54,7 +62,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -72,10 +80,16 @@ LCD: _include: - patches/lcd/ram_segment_40.yaml +OPAMP: {} + PWR: _include: - fields/pwr/pwr_v1.yaml +RCC: {} + +RI: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -84,11 +98,15 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SDIO: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TIM2: _include: - patches/tim/rename_TIM2_CCR3_CCR3.yaml diff --git a/devices/stm32l162.yaml b/devices/stm32l162.yaml index 9491f32f4..a85bc78f0 100644 --- a/devices/stm32l162.yaml +++ b/devices/stm32l162.yaml @@ -10,6 +10,8 @@ AES: - patches/aes/fields.yaml - fields/aes/v1.yaml +COMP: {} + CRC: DR: # The SVD calls the DR field "Data_register" @@ -31,19 +33,25 @@ DAC: - fields/dac/dac_wavegen.yaml - fields/dac/dac_dmaudr.yaml +DBGMCU: {} + +DMA1: {} + EXTI: _include: - patches/exti/split.yaml - fields/exti/common.yaml - collect/exti/farray.yaml +Flash: {} + FSMC: _include: - patches/fsmc/fsmc_sramfix_common.yaml - fields/fsmc/fsmc_sram.yaml - collect/fsmc/sram.yaml -GPIO?: +GPIO[ABC]: _include: - patches/gpio/with_OSPEEDER.yaml - fields/gpio/v2/common.yaml @@ -54,7 +62,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - patches/16bit.yaml - fields/i2c/v1.yaml @@ -72,10 +80,16 @@ LCD: _include: - patches/lcd/ram_segment_40.yaml +OPAMP: {} + PWR: _include: - fields/pwr/pwr_v1.yaml +RCC: {} + +RI: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -84,11 +98,15 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SPI?: +SDIO: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TIM2: _include: - patches/tim/rename_TIM2_CCR3_CCR3.yaml From 6d14c3520525121346833ae623d410282ba1c664 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Thu, 6 Feb 2025 15:06:27 +0300 Subject: [PATCH 10/13] L4/L5 --- devices/patches/ltdc/rename.yaml | 1 + devices/stm32l412.yaml | 32 +++++++++++++---- devices/stm32l4p5.yaml | 60 ++++++++++++++++++++++---------- devices/stm32l4r5.yaml | 58 ++++++++++++++++++++++++------ devices/stm32l4r9.yaml | 58 ++++++++++++++++++++++++------ devices/stm32l4x1.yaml | 39 +++++++++++++++++---- devices/stm32l4x2.yaml | 39 +++++++++++++++++---- devices/stm32l4x3.yaml | 35 +++++++++++++++---- devices/stm32l4x5.yaml | 58 ++++++++++++++++++++---------- devices/stm32l4x6.yaml | 53 ++++++++++++++++++++++------ devices/stm32l552.yaml | 48 ++++++++++++++++++++----- devices/stm32l562.yaml | 46 ++++++++++++++++++++---- 12 files changed, 421 insertions(+), 106 deletions(-) diff --git a/devices/patches/ltdc/rename.yaml b/devices/patches/ltdc/rename.yaml index 26608cedf..06af82973 100644 --- a/devices/patches/ltdc/rename.yaml +++ b/devices/patches/ltdc/rename.yaml @@ -4,4 +4,5 @@ _modify: _peripherals: LTCD: name: LTDC + groupName: LTDC description: LCD-TFT display controller diff --git a/devices/stm32l412.yaml b/devices/stm32l412.yaml index eec9b156b..ccb4a1db1 100644 --- a/devices/stm32l412.yaml +++ b/devices/stm32l412.yaml @@ -33,11 +33,13 @@ _modify: ADC_Common: _include: - patches/adc/l4+common.yaml + - fields/adc/adc_v3_common.yaml - fields/adc/adc_v3_common_l4+.yaml -ADC*_*: +ADC12_Common: _strip: ADC_ - _include: fields/adc/adc_v3_common.yaml + _include: + - fields/adc/adc_v3_common.yaml ADC1: _strip: ADC_ @@ -58,6 +60,8 @@ ADC1: SQR?: SQ*: [0, 18] +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -66,7 +70,11 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml -DMA?: +CRS: {} + +DBGMCU: {} + +DMA1: _include: - fields/dma/dma_v1_with_remapping.yaml - collect/dma/v1.yaml @@ -80,7 +88,9 @@ FIREWALL: _include: - fields/fw/fw_l0_l4.yaml -GPIO?: +FLASH: {} + +GPIO[ABCH]: BRR: _add: BR: @@ -98,13 +108,15 @@ GPIO[A]: GPIO[BCH]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml IWDG: _include: patches/16bit.yaml +LPTIM1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEATx_fields.yaml @@ -113,6 +125,10 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v3/lp_A.yaml +OPAMP: {} + +PWR: {} + QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml @@ -157,19 +173,23 @@ RCC: _include: - fields/rcc/rcc_l4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml - patches/spi/rename_dff_tifrfe.yaml - fields/spi/spi_common.yaml +SYSCFG: {} + TIM1: _include: - patches/tim/icpsc.yaml diff --git a/devices/stm32l4p5.yaml b/devices/stm32l4p5.yaml index d57230041..f83c98e98 100644 --- a/devices/stm32l4p5.yaml +++ b/devices/stm32l4p5.yaml @@ -8,8 +8,6 @@ _modify: # The SVD calls ADC1 ADC. ADC: name: ADC1 - LTCD: - groupName: LTCD _delete: - SWPMI1 @@ -42,12 +40,14 @@ AES: - patches/aes/l4+.yaml - fields/aes/v2.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: INIT: _modify: @@ -58,11 +58,15 @@ CRC: - fields/crc/crc_advanced.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - patches/dac/dac_l4+.yaml - fields/dac/dac_l4+.yaml +DBGMCU: {} + DCMI: _include: - patches/dcmi/dcmi.yaml @@ -79,15 +83,15 @@ DFSDM1: - fields/dfsdm/dfsdm.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_l4+.yaml - -DMA?: +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml +DMA2D: + _include: + - patches/dma/dma2d_l4+.yaml + DMAMUX: _include: - fields/dma/dmamux_wl.yaml @@ -98,6 +102,8 @@ EXTI: - patches/exti/l4+.yaml - fields/exti/common.yaml +FIREWALL: {} + FLASH: ACR: _modify: @@ -112,7 +118,7 @@ FMC: - patches/fsmc/fsmc_l4+.yaml - patches/fsmc/fsmc_nand.yaml -GPIO?: +GPIO[ABCI]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -126,14 +132,14 @@ HASH: _include: - patches/hash/hash_l4+.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml IWDG: _include: patches/16bit.yaml -LPTIM?: +LPTIM1: _add: OR: description: ?? @@ -173,11 +179,6 @@ LTDC: MPU: _strip: MPU_ -PWR: - _strip: PWR_ - _include: - - fields/pwr/pwr_l4+.yaml - OCTOSPI1: DCR1: _modify: @@ -187,6 +188,25 @@ OCTOSPI1: - patches/octospi/l4+.yaml - fields/octospi/l4.yaml +OCTOSPIM: {} + +OPAMP: {} + +#OTG_FS_DEVICE: {} + +#OTG_FS_GLOBAL: {} + +#OTG_FS_HOST: {} + +#OTG_FS_PWRCLK: {} + +PSSI: {} + +PWR: + _strip: PWR_ + _include: + - fields/pwr/pwr_l4+.yaml + RCC: CFGR: _modify: @@ -212,14 +232,16 @@ RTC: - fields/rtc/v3.yaml # - collect/rtc/alarm.yaml -SAI?: +SAI1: _include: - patches/sai/sai_l4+.yaml - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC[12]: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -343,6 +365,8 @@ USART1: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32l4r5.yaml b/devices/stm32l4r5.yaml index 5f8acab0b..69ed2aa71 100644 --- a/devices/stm32l4r5.yaml +++ b/devices/stm32l4r5.yaml @@ -42,12 +42,14 @@ AES: - patches/aes/l4+.yaml - fields/aes/v2.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -56,6 +58,14 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + +DAC: {} + +DBGMCU: {} + +DCMI: {} + DFSDM1: _strip: DFSDM_ _delete: @@ -72,15 +82,15 @@ DFSDM1: addressOffset: 0xF0 description: CH7DATINR -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml - -DMA?: +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + DMAMUX1: _include: - collect/dma/dmamux.yaml @@ -107,11 +117,13 @@ FLASH: SYSF_ECC: bitOffset: 22 +FMC: {} + GFXMMU: _include: - collect/gfxmmu/lut.yaml -GPIO?: +GPIO[ABCI]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -125,7 +137,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -137,12 +149,27 @@ IWDG: MPU: _strip: MPU_ +LPTIM1: {} + LPUART1: _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - fields/usart/v4/lp_wl.yaml +LTDC: {} + +OCTOSPI1: {} + +OCTOSPIM: {} + +OPAMP: {} + +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + PWR: _strip: PWR_ @@ -199,6 +226,8 @@ RCC: _include: - fields/rcc/rcc_l4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -207,17 +236,23 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC1: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SWPMI1: {} + +SYSCFG: {} + TIM?: _strip: TIM?_ @@ -313,6 +348,8 @@ USART1: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG: _include: - patches/16bit.yaml @@ -322,6 +359,7 @@ _include: #- patches/usart/rename_CR2_DATAINV_field.yaml #- patches/usart/rename_LPUART_CR2_DATAINV_field.yaml #- patches/usart/merge_BRR_fields.yaml + - patches/ltdc/rename.yaml - patches/tim/group.yaml - patches/dbgmcu/l4_apb_fzr_rename.yaml - patches/usb_otg/fs_remove_prefix.yaml diff --git a/devices/stm32l4r9.yaml b/devices/stm32l4r9.yaml index 7d05e0124..da124df28 100644 --- a/devices/stm32l4r9.yaml +++ b/devices/stm32l4r9.yaml @@ -39,12 +39,14 @@ AES: - patches/aes/l4+.yaml - fields/aes/v2.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -53,18 +55,26 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + +DAC: {} + +DBGMCU: {} + +DCMI: {} + DFSDM1: _strip: DFSDM_ -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml - -DMA?: +DMA1: _include: - fields/dma/v1.yaml - collect/dma/v1.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + DMAMUX1: _include: - collect/dma/dmamux.yaml @@ -90,11 +100,13 @@ FLASH: _include: - patches/flash/flash_boot0s.yaml +FMC: {} + GFXMMU: _include: - collect/gfxmmu/lut.yaml -GPIO?: +GPIO[ABCI]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -108,7 +120,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -120,12 +132,27 @@ IWDG: MPU: _strip: MPU_ +LPTIM1: {} + LPUART1: _strip: LPUART_ _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - fields/usart/v4/lp_wl.yaml +LTDC: {} + +OCTOSPI1: {} + +OCTOSPIM: {} + +OPAMP: {} + +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + PWR: _strip: PWR_ @@ -139,6 +166,8 @@ RCC: _include: - fields/rcc/rcc_l4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -147,17 +176,23 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC1: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SWPMI1: {} + +SYSCFG: {} + TIM?: _strip: TIM?_ @@ -253,6 +288,8 @@ USART1: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG: _include: - patches/16bit.yaml @@ -262,6 +299,7 @@ _include: #- patches/usart/rename_CR2_DATAINV_field.yaml #- patches/usart/rename_LPUART_CR2_DATAINV_field.yaml #- patches/usart/merge_BRR_fields.yaml + - patches/ltdc/rename.yaml - patches/tim/group.yaml - patches/dbgmcu/l4_apb_fzr_rename.yaml - patches/usb_otg/fs_remove_prefix.yaml diff --git a/devices/stm32l4x1.yaml b/devices/stm32l4x1.yaml index e7487060d..954b6cc25 100644 --- a/devices/stm32l4x1.yaml +++ b/devices/stm32l4x1.yaml @@ -19,9 +19,10 @@ _copy: ADC_Common: _include: - patches/adc/l4+common.yaml + - fields/adc/adc_v3_common.yaml - fields/adc/adc_v3_common_l4+.yaml -ADC*_*: +ADC123_Common: _include: fields/adc/adc_v3_common.yaml ADC1: @@ -46,12 +47,14 @@ AES: - patches/aes/l4.yaml - fields/aes/v2.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -60,10 +63,14 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - fields/dac/dac_l4xx.yaml +DBGMCU: {} + DFSDM: _strip: DFSDM_ _modify: @@ -71,7 +78,7 @@ DFSDM: name: FLT1JCHGR _include: collect/dfsdm/l4.yaml -DMA?: +DMA1: _include: - fields/dma/dma_v1_with_remapping.yaml - collect/dma/v1.yaml @@ -89,7 +96,7 @@ FLASH: _include: - patches/flash/flash_boot0s.yaml -GPIO?: +GPIO[ABC]: _include: - patches/gpio/l4_brr.yaml - fields/gpio/v2/common.yaml @@ -100,7 +107,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -114,6 +121,8 @@ LCD: _include: - patches/lcd/ram_segment_40.yaml +LPTIM1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEATx_fields.yaml @@ -122,6 +131,10 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v3/lp_A.yaml +OPAMP: {} + +PWR: {} + QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml @@ -173,6 +186,8 @@ RCC: - fields/rcc/rcc_l4_usart2_3.yaml - fields/rcc/rcc_l4_uart4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -181,19 +196,25 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml - patches/spi/rename_dff_tifrfe.yaml - fields/spi/spi_common.yaml +SWPMI1: {} + +SYSCFG: {} + TIM[18]: _include: - patches/tim/v2/oc5m_bit3.yaml @@ -258,6 +279,10 @@ USART1: - patches/usart/merge_BRR_fields.yaml - fields/usart/v3/B.yaml +USB_SRAM: {} + +VREFBUF: {} + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32l4x2.yaml b/devices/stm32l4x2.yaml index 77b736972..0b80def6f 100644 --- a/devices/stm32l4x2.yaml +++ b/devices/stm32l4x2.yaml @@ -28,9 +28,10 @@ _modify: ADC_Common: _include: - patches/adc/l4+common.yaml + - fields/adc/adc_v3_common.yaml - fields/adc/adc_v3_common_l4+.yaml -ADC*_*: +ADC123_Common: _strip: ADC_ _include: fields/adc/adc_v3_common.yaml @@ -59,12 +60,14 @@ AES: - patches/aes/l4.yaml - fields/aes/v2.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -73,10 +76,14 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - fields/dac/dac_l4xx.yaml +DBGMCU: {} + DFSDM: _strip: DFSDM_ _modify: @@ -84,7 +91,7 @@ DFSDM: name: FLT1JCHGR _include: collect/dfsdm/l4.yaml -DMA?: +DMA1: _include: - fields/dma/dma_v1_with_remapping.yaml - collect/dma/v1.yaml @@ -98,7 +105,9 @@ FIREWALL: _include: - fields/fw/fw_l0_l4.yaml -GPIO?: +FLASH: {} + +GPIO[ABC]: _include: - patches/gpio/l4_brr.yaml - fields/gpio/v2/common.yaml @@ -109,7 +118,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -123,6 +132,8 @@ LCD: _include: - patches/lcd/ram_segment_40.yaml +LPTIM1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEATx_fields.yaml @@ -131,6 +142,10 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v3/lp_A.yaml +OPAMP: {} + +PWR: {} + QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml @@ -194,6 +209,8 @@ RCC: - fields/rcc/rcc_l4_usart2_3.yaml - fields/rcc/rcc_l4_uart4.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -202,19 +219,25 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml - patches/spi/rename_dff_tifrfe.yaml - fields/spi/spi_common.yaml +SWPMI1: {} + +SYSCFG: {} + TIM1: _include: - patches/tim/icpsc.yaml @@ -283,6 +306,8 @@ USB: - fields/usb/usb_with_LPM.yaml - collect/usb/epxr.yaml +VREFBUF: {} + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32l4x3.yaml b/devices/stm32l4x3.yaml index feb508bfc..6684185a3 100644 --- a/devices/stm32l4x3.yaml +++ b/devices/stm32l4x3.yaml @@ -12,9 +12,10 @@ _modify: ADC_Common: _include: - patches/adc/l4+common.yaml + - fields/adc/adc_v3_common.yaml - fields/adc/adc_v3_common_l4+.yaml -ADC*_*: +ADC123_Common: _include: fields/adc/adc_v3_common.yaml ADC1: @@ -42,6 +43,8 @@ CAN1: - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -50,11 +53,15 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - fields/dac/dac_l4xx.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/dma_v1_with_remapping.yaml - collect/dma/v1.yaml @@ -72,7 +79,7 @@ FLASH: _include: - patches/flash/flash_boot0s.yaml -GPIO?: +GPIO[ABC]: _include: - patches/gpio/l4_brr.yaml - fields/gpio/v2/common.yaml @@ -83,7 +90,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -97,6 +104,8 @@ LCD: _include: - patches/lcd/ram_segment_40.yaml +LPTIM1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEATx_fields.yaml @@ -105,6 +114,10 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v3/lp_A.yaml +OPAMP: {} + +PWR: {} + # SVD incorrectly labels APB1ENR1 bit 26 as USBF instead of USBFSEN. RCC: APB1ENR1: @@ -140,6 +153,8 @@ RCC: - fields/rcc/rcc_l4.yaml - fields/rcc/rcc_l4_usart2_3.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -148,19 +163,25 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml - patches/spi/rename_dff_tifrfe.yaml - fields/spi/spi_common.yaml +SWPMI1: {} + +SYSCFG: {} + TIM1: _include: - patches/tim/icpsc.yaml @@ -273,6 +294,8 @@ USB: bitOffset: 15 bitWidth: 1 +VREFBUF: {} + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32l4x5.yaml b/devices/stm32l4x5.yaml index 0382d0ecf..e491e4b76 100644 --- a/devices/stm32l4x5.yaml +++ b/devices/stm32l4x5.yaml @@ -71,6 +71,8 @@ CAN1: - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -79,10 +81,14 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - fields/dac/dac_l4xx.yaml +DBGMCU: {} + DFSDM: _strip: DFSDM_ _modify: @@ -90,11 +96,24 @@ DFSDM: name: FLT1JCHGR _include: collect/dfsdm/l4.yaml -DMA?: +DMA1: _include: - fields/dma/dma_v1_with_remapping.yaml - collect/dma/v1.yaml +EXTI: + _include: + - patches/exti/add_fpu_interrupt.yaml + - fields/exti/common.yaml + +FIREWALL: + _include: + - fields/fw/fw_l0_l4.yaml + +FLASH: + _include: + - patches/flash/flash_boot0s.yaml + FMC: BCR1: _add: @@ -134,20 +153,7 @@ FMC: - fields/fsmc/fsmc_nand.yaml - collect/fsmc/sram.yaml -EXTI: - _include: - - patches/exti/add_fpu_interrupt.yaml - - fields/exti/common.yaml - -FIREWALL: - _include: - - fields/fw/fw_l0_l4.yaml - -FLASH: - _include: - - patches/flash/flash_boot0s.yaml - -GPIO?: +GPIO[ABC]: _include: - patches/gpio/l4_ascr.yaml - patches/gpio/l4_brr.yaml @@ -159,7 +165,7 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -173,6 +179,8 @@ LCD: _include: - patches/lcd/ram_segment_40.yaml +LPTIM1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEATx_fields.yaml @@ -181,6 +189,10 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v3/lp_A.yaml +OPAMP: {} + +PWR: {} + QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml @@ -248,19 +260,25 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml - patches/spi/rename_dff_tifrfe.yaml - fields/spi/spi_common.yaml +SWPMI1: {} + +SYSCFG: {} + TIM[18]: _include: - patches/tim/icpsc.yaml @@ -326,6 +344,10 @@ USART1: - patches/usart/merge_BRR_fields.yaml - fields/usart/v3/B.yaml +USB: {} + +VREFBUF: {} + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32l4x6.yaml b/devices/stm32l4x6.yaml index dd2833e76..a96356396 100644 --- a/devices/stm32l4x6.yaml +++ b/devices/stm32l4x6.yaml @@ -34,12 +34,14 @@ AES: - patches/aes/l4.yaml - fields/aes/v2.yaml -CAN?: +CAN1: _include: - fields/can/can.yaml - collect/can/can.yaml - collect/can/filter_bank.yaml +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -48,10 +50,16 @@ CRC: - fields/crc/crc_idr_8bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + DAC: _include: - fields/dac/dac_l4xx.yaml +DBGMCU: {} + +DCMI: {} + DFSDM: _strip: DFSDM_ _modify: @@ -59,15 +67,15 @@ DFSDM: name: FLT1JCHGR _include: collect/dfsdm/l4.yaml -DMA2D: - _include: - - fields/dma/dma2d_v1.yaml - -DMA?: +DMA1: _include: - fields/dma/dma_v1_with_remapping.yaml - collect/dma/v1.yaml +DMA2D: + _include: + - fields/dma/dma2d_v1.yaml + EXTI: _include: - patches/exti/add_fpu_interrupt.yaml @@ -77,7 +85,11 @@ FIREWALL: _include: - fields/fw/fw_l0_l4.yaml -GPIO?: +FLASH: {} + +FMC: {} + +GPIO[ABCI]: _include: - fields/gpio/v2/common.yaml - collect/gpio/v2.yaml @@ -91,7 +103,7 @@ HASH: _include: - collect/hash/v2.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -106,6 +118,8 @@ LCD: _include: - patches/lcd/ram_segment_40.yaml +LPTIM1: {} + LPUART1: _include: - patches/usart/merge_CR1_DEATx_fields.yaml @@ -114,6 +128,15 @@ LPUART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v3/lp_A.yaml +OPAMP: {} + +#OTG_FS_DEVICE: {} +#OTG_FS_GLOBAL: {} +#OTG_FS_HOST: {} +#OTG_FS_PWRCLK: {} + +PWR: {} + QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml @@ -133,6 +156,8 @@ RCC: - fields/rcc/rcc_l4_uart4.yaml - fields/rcc/rcc_l4_uart5.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -141,19 +166,25 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml - collect/sai/ch.yaml -SPI?: +SDMMC1: {} + +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml - patches/spi/rename_dff_tifrfe.yaml - fields/spi/spi_common.yaml +SWPMI1: {} + +SYSCFG: {} + TIM[18]: _include: - patches/tim/icpsc.yaml @@ -239,6 +270,8 @@ USART1: - patches/usart/merge_BRR_fields.yaml - fields/usart/v3/B.yaml +VREFBUF: {} + WWDG: _include: - patches/16bit.yaml diff --git a/devices/stm32l552.yaml b/devices/stm32l552.yaml index cc922d7d3..5d8c983dd 100644 --- a/devices/stm32l552.yaml +++ b/devices/stm32l552.yaml @@ -25,7 +25,7 @@ ADC_Common: bitOffset: 8 bitWidth: 4 -ADC?: +ADC[12]: _include: - patches/adc/split.yaml - patches/adc/offset_en.yaml @@ -43,10 +43,20 @@ ADC?: SQR?: SQ*: [0, 18] +COMP: {} + +CRC: {} + +CRS: {} + DAC: _strip: DAC_ -DMA?: +DBGMCU: {} + +DCB: {} + +DMA1: _include: - collect/dma/l5.yaml @@ -68,7 +78,7 @@ FLASH: FMC: _strip: FMC_ -GPIO?: +GPIO[ABCH]: _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2.yaml @@ -78,7 +88,7 @@ GPIO[A]: GPIO[BCH]: _include: collect/gpio/v2_derive.yaml -GTZC_MPCBB?: +GTZC_MPCBB[12]: _strip: MPCBB?_ GTZC_TZIC: @@ -87,29 +97,43 @@ GTZC_TZIC: GTZC_TZSC: _strip: TZSC_ +HASH: {} + +I2C1: {} + +ICACHE: {} + IWDG: _include: patches/16bit.yaml +LPTIM1: {} + LPUART1: _include: - patches/usart/merge_CR2_ADDx_fields.yaml - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml -RNG: - _strip: RNG_ +OCTOSPI1: {} + +OPAMP: {} + +PWR: {} RCC: _include: - fields/rcc/rcc_l5.yaml +RNG: + _strip: RNG_ + RTC: _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml @@ -119,11 +143,13 @@ SAI?: SDMMC1: _strip: SDMMC_ -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TAMP: _include: - collect/rtc/tamp_bkpr.yaml @@ -197,6 +223,8 @@ TIM1[67]: - fields/tim/v2/tim16.yaml - collect/tim/ccr.yaml +TSC: {} + UCPD1: _include: - patches/ucpd/rxordseten_split.yaml @@ -213,6 +241,10 @@ USART1: - patches/usart/add_udr.yaml - fields/usart/v4/B.yaml +USB: {} + +VREFBUF: {} + WWDG: _include: patches/16bit.yaml diff --git a/devices/stm32l562.yaml b/devices/stm32l562.yaml index c8a3fdce8..ff389d3fb 100644 --- a/devices/stm32l562.yaml +++ b/devices/stm32l562.yaml @@ -25,7 +25,7 @@ ADC_Common: bitOffset: 8 bitWidth: 4 -ADC?: +ADC[12]: _include: - patches/adc/split.yaml - patches/adc/offset_en.yaml @@ -51,10 +51,20 @@ AES: _include: - fields/aes/v2.yaml +COMP: {} + +CRC: {} + +CRS: {} + DAC: _strip: DAC_ -DMA?: +DBGMCU: {} + +DCB: {} + +DMA1: _include: - collect/dma/l5.yaml @@ -76,7 +86,7 @@ FLASH: FMC: _strip: FMC_ -GPIO?: +GPIO[ABCH]: _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2.yaml @@ -86,7 +96,7 @@ GPIO[A]: GPIO[BCH]: _include: collect/gpio/v2_derive.yaml -GTZC_MPCBB?: +GTZC_MPCBB[12]: _strip: MPCBB?_ _array: VCTR*: @@ -98,18 +108,34 @@ GTZC_TZIC: GTZC_TZSC: _strip: TZSC_ +HASH: {} + +I2C1: {} + +ICACHE: {} + IWDG: _include: patches/16bit.yaml +LPTIM1: {} + LPUART1: _include: - patches/usart/merge_CR2_ADDx_fields.yaml - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/lp_wl.yaml +OCTOSPI1: {} + +OPAMP: {} + +OTFDEC1: {} + PKA: _strip: PKA_ +PWR: {} + RCC: _include: - fields/rcc/rcc_l5.yaml @@ -123,7 +149,7 @@ RTC: - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SAI?: +SAI1: _include: - patches/sai/sai_v1.yaml - fields/sai/sai.yaml @@ -133,11 +159,13 @@ SAI?: SDMMC1: _strip: SDMMC_ -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml +SYSCFG: {} + TAMP: _include: - collect/rtc/tamp_bkpr.yaml @@ -211,6 +239,8 @@ TIM1[67]: - fields/tim/v2/tim16.yaml - collect/tim/ccr.yaml +TSC: {} + UCPD1: _include: - patches/ucpd/rxordseten_split.yaml @@ -227,6 +257,10 @@ USART1: - patches/usart/add_udr.yaml - fields/usart/v4/B.yaml +USB: {} + +VREFBUF: {} + WWDG: _include: patches/16bit.yaml From 843ead67a7ef578c33178a49160bab38bb4e6b4e Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Thu, 6 Feb 2025 19:39:55 +0300 Subject: [PATCH 11/13] U0, U5, WB --- devices/collect/gtzc/h5_u5.yaml | 2 +- devices/patches/pwr/add_cr5.yaml | 5 ++ devices/patches/u5.yaml | 46 -------------- devices/stm32h533.yaml | 5 +- devices/stm32h573.yaml | 5 +- devices/stm32u031.yaml | 8 ++- devices/stm32u073.yaml | 8 ++- devices/stm32u083.yaml | 8 ++- devices/stm32u535.yaml | 97 ++++++++++++++++++++++++++--- devices/stm32u545.yaml | 103 ++++++++++++++++++++++++++++--- devices/stm32u575.yaml | 99 ++++++++++++++++++++++++++--- devices/stm32u585.yaml | 99 ++++++++++++++++++++++++++--- devices/stm32u595.yaml | 97 ++++++++++++++++++++++++++--- devices/stm32u599.yaml | 101 +++++++++++++++++++++++++++--- devices/stm32u5a5.yaml | 103 ++++++++++++++++++++++++++++--- devices/stm32u5a9.yaml | 103 ++++++++++++++++++++++++++++--- devices/stm32wb55.yaml | 40 +++++++++--- devices/stm32wl5x_cm0p.yaml | 19 +++--- devices/stm32wl5x_cm4.yaml | 21 ++++--- devices/stm32wle5.yaml | 19 +++--- 20 files changed, 837 insertions(+), 151 deletions(-) create mode 100644 devices/patches/pwr/add_cr5.yaml delete mode 100644 devices/patches/u5.yaml diff --git a/devices/collect/gtzc/h5_u5.yaml b/devices/collect/gtzc/h5_u5.yaml index 418f91966..90595ca4f 100644 --- a/devices/collect/gtzc/h5_u5.yaml +++ b/devices/collect/gtzc/h5_u5.yaml @@ -8,6 +8,6 @@ _array: _array: PRIV*: {} -CFGLOCK?,CFGLOCKR?: +CFGLOCK,CFGLOCK?,CFGLOCKR?: _array: SPLCK*: {} diff --git a/devices/patches/pwr/add_cr5.yaml b/devices/patches/pwr/add_cr5.yaml new file mode 100644 index 000000000..427a81901 --- /dev/null +++ b/devices/patches/pwr/add_cr5.yaml @@ -0,0 +1,5 @@ +_add: + CR5: + addressOffset: 0xAC + size: 0x20 + resetValue: 0x00000000 diff --git a/devices/patches/u5.yaml b/devices/patches/u5.yaml deleted file mode 100644 index 6bf266c14..000000000 --- a/devices/patches/u5.yaml +++ /dev/null @@ -1,46 +0,0 @@ -_clear_fields: "*" - -_modify: - ICache: - name: ICACHE - -FLASH: - _strip: FLASH_ - -ICACHE: - _strip: ICACHE_ - -DCACHE,DCACHE?: - _strip: DCACHE_ - -PWR: - _strip: PWR_ - _add: - CR5: - addressOffset: 0xAC - size: 0x20 - resetValue: 0x00000000 - -RCC: - _strip: RCC_ - -GPIO?: - _strip: GPIO_ - -LPGPIO?: - _strip: LPGPIO_ - -LPDMA?: - _strip: LPDMA_ - -DLYBOS,DLYBOS?: - _strip: DLYB_ - -DAC,DAC?: - _strip: DAC_ - -VREFBUF: - _strip: VREFBUF_ - -ADF?: - _strip: ADF_ diff --git a/devices/stm32h533.yaml b/devices/stm32h533.yaml index 23f9ee652..9df7a56b1 100644 --- a/devices/stm32h533.yaml +++ b/devices/stm32h533.yaml @@ -113,8 +113,9 @@ FDCAN1: _strip: FDCAN_ FLASH: - _strip: FLASH_ - # - collect/flash/secbbr.yaml + _strip: + FLASH_ + # - collect/flash/secbbr.yaml FMC: _strip: FMC_ diff --git a/devices/stm32h573.yaml b/devices/stm32h573.yaml index 0df3c5983..a9ec529fb 100644 --- a/devices/stm32h573.yaml +++ b/devices/stm32h573.yaml @@ -67,8 +67,9 @@ EXTI: - fields/exti/exti_priv.yaml FDCAN1: - _strip: FDCAN_ - # - collect/flash/secbbr.yaml + _strip: + FDCAN_ + # - collect/flash/secbbr.yaml FLASH: _strip: FLASH_ diff --git a/devices/stm32u031.yaml b/devices/stm32u031.yaml index 5715568a0..546e0f407 100644 --- a/devices/stm32u031.yaml +++ b/devices/stm32u031.yaml @@ -9,6 +9,8 @@ _modify: ADC: _strip: ADC_ +COMP1: {} + CRC: _strip: CRC_ @@ -30,7 +32,7 @@ EXTI: FLASH: _strip: FLASH_ -GPIO?: +GPIO[ABCDEF]: _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml @@ -47,7 +49,7 @@ I2C1: IWDG: _strip: IWDG_ -LPTIM?: +LPTIM[12]: _strip: LPTIM?_ LPUART1: @@ -57,6 +59,8 @@ LPUART1: - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml +OPAMP: {} + PWR: _strip: PWR_ diff --git a/devices/stm32u073.yaml b/devices/stm32u073.yaml index a8101b28f..91321e0de 100644 --- a/devices/stm32u073.yaml +++ b/devices/stm32u073.yaml @@ -11,6 +11,8 @@ _modify: ADC: _strip: ADC_ +COMP1: {} + CRC: _strip: CRC_ @@ -35,7 +37,7 @@ EXTI: FLASH: _strip: FLASH_ -GPIO?: +GPIO[ABCDEF]: _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml @@ -58,7 +60,7 @@ LCD: _include: - patches/lcd/ram_segment_48.yaml -LPTIM?: +LPTIM[123]: _strip: LPTIM?_ LPUART1: @@ -68,6 +70,8 @@ LPUART1: - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml +OPAMP: {} + PWR: _strip: PWR_ diff --git a/devices/stm32u083.yaml b/devices/stm32u083.yaml index 2e6ed11c1..a2aa7c907 100644 --- a/devices/stm32u083.yaml +++ b/devices/stm32u083.yaml @@ -14,6 +14,8 @@ ADC: AES: _strip: AES_ +COMP: {} + CRC: _strip: CRC_ @@ -38,7 +40,7 @@ EXTI: FLASH: _strip: FLASH_ -GPIO?: +GPIO[ABCDEF]: _strip: GPIO?_ _include: - fields/gpio/gpio_l5_u5.yaml @@ -61,7 +63,7 @@ LCD: _include: - patches/lcd/ram_segment_48.yaml -LPTIM?: +LPTIM[123]: _strip: LPTIM?_ LPUART1: @@ -71,6 +73,8 @@ LPUART1: - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml +OPAMP: {} + PWR: _strip: PWR_ diff --git a/devices/stm32u535.yaml b/devices/stm32u535.yaml index 582d589c8..d802959c7 100644 --- a/devices/stm32u535.yaml +++ b/devices/stm32u535.yaml @@ -1,5 +1,11 @@ _svd: ../svd/stm32u535.svd +_clear_fields: "*" + +_modify: + ICache: + name: ICACHE + ADC12_Common: _strip: ADC12_ _include: @@ -34,6 +40,32 @@ ADC4: name: CHSELR1 alternateRegister: CHSELR0 +ADF1: + _strip: ADF_ + +COMP: {} + +CORDIC: {} + +CRC: {} + +CRS: {} + +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCACHE: + _strip: DCACHE_ + +DCB: {} + +DCMI: {} + +DLYBOS: + _strip: DLYB_ + EXTI: _strip: EXTI_ _include: @@ -42,13 +74,19 @@ EXTI: FDCAN1_RAM: _strip: FDCAN_ -GPDMA?: +FMAC: {} + +FLASH: + _strip: FLASH_ + +GPDMA1: _strip: GPDMA_ _include: - patches/dma/gpdma_u5_tr1.yaml - collect/dma/gpdma/h7rs_u5.yaml -GPIO?: +GPIO[ABCH]: + _strip: GPIO_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -58,22 +96,44 @@ GPIO[A]: GPIO[BCH]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[12]: + _strip: MPCBB?_ + _include: + - collect/gtzc/h5_u5.yaml + +GTZC2_MPCBB4: _strip: MPCBB?_ _include: - collect/gtzc/h5_u5.yaml +GTZC[12]_TZIC: {} + GTZC1_TZSC: _strip: TZSC_ -I2C?: +GTZC2_TZSC: {} + +HASH: {} + +I2C1: _strip: I2C_ _include: - fields/i2c/v3.yaml +ICACHE: + _strip: ICACHE_ + IWDG: _include: patches/16bit.yaml +LPDMA1: + _strip: LPDMA_ + +LPGPIO1: + _strip: LPGPIO_ + +LPTIM[14]: {} + LPUART1: _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml @@ -84,12 +144,17 @@ MDF1: _include: - collect/mdf/u5.yaml -OCTOSPI[12]: +OPAMP: {} + +OCTOSPI1: _include: - patches/octospi/u535_u545.yaml - fields/octospi/u5.yaml +PSSI: {} + PWR: + _strip: PWR_ _delete: [PUCRF, PUCRI, PUCRJ] CR1: _delete: SRAM5PD @@ -100,24 +165,36 @@ PWR: CR4: _delete: SRAM5PDS* _include: + - patches/pwr/add_cr5.yaml - fields/pwr/pwr_u5.yaml +RAMCFG: {} + RCC: + _strip: RCC_ _include: - fields/rcc/rcc_u5.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml +SAI1: {} + SDMMC: _strip: SDMMC_ -SPI?: +SPI1: _include: patches/spi/rxtxdr.yaml +SYSCFG: {} + +TAMP: {} + TIM?: _strip: TIM?_ @@ -169,6 +246,8 @@ TIM16: - fields/tim/v3/occe.yaml - collect/tim/ccr.yaml +TSC: {} + USART1: _strip: USART_ _include: @@ -176,8 +255,8 @@ USART1: - patches/usart/add_udr.yaml - fields/usart/v4/C.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: patches/16bit.yaml - -_include: - - patches/u5.yaml diff --git a/devices/stm32u545.yaml b/devices/stm32u545.yaml index 9125b0f93..a1ade595e 100644 --- a/devices/stm32u545.yaml +++ b/devices/stm32u545.yaml @@ -1,5 +1,11 @@ _svd: ../svd/stm32u545.svd +_clear_fields: "*" + +_modify: + ICache: + name: ICACHE + ADC12_Common: _strip: ADC12_ _include: @@ -34,6 +40,9 @@ ADC4: name: CHSELR1 alternateRegister: CHSELR0 +ADF1: + _strip: ADF_ + AES: SUSP?R: _modify: @@ -42,6 +51,29 @@ AES: _include: - fields/aes/v3.yaml +COMP: {} + +CORDIC: {} + +CRC: {} + +CRS: {} + +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCACHE: + _strip: DCACHE_ + +DCB: {} + +DCMI: {} + +DLYBOS: + _strip: DLYB_ + EXTI: _strip: EXTI_ _include: @@ -50,13 +82,19 @@ EXTI: FDCAN1_RAM: _strip: FDCAN_ -GPDMA?: +FMAC: {} + +FLASH: + _strip: FLASH_ + +GPDMA1: _strip: GPDMA_ _include: - patches/dma/gpdma_u5_tr1.yaml - collect/dma/gpdma/h7rs_u5.yaml -GPIO?: +GPIO[ABCH]: + _strip: GPIO_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -66,22 +104,44 @@ GPIO[A]: GPIO[BCH]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[12]: _strip: MPCBB?_ _include: - collect/gtzc/h5_u5.yaml +GTZC2_MPCBB4: + _strip: MPCBB?_ + _include: + - collect/gtzc/h5_u5.yaml + +GTZC[12]_TZIC: {} + GTZC1_TZSC: _strip: TZSC_ -I2C?: +GTZC2_TZSC: {} + +HASH: {} + +I2C1: _strip: I2C_ _include: - fields/i2c/v3.yaml +ICACHE: + _strip: ICACHE_ + IWDG: _include: patches/16bit.yaml +LPDMA1: + _strip: LPDMA_ + +LPGPIO1: + _strip: LPGPIO_ + +LPTIM[14]: {} + LPUART1: _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml @@ -92,12 +152,21 @@ MDF1: _include: - collect/mdf/u5.yaml -OCTOSPI[12]: +OPAMP: {} + +OTFDEC1: {} + +OCTOSPI1: _include: - patches/octospi/u535_u545.yaml - fields/octospi/u5.yaml +PKA: {} + +PSSI: {} + PWR: + _strip: PWR_ _delete: [PUCRF, PUCRI, PUCRJ] CR1: _delete: SRAM5PD @@ -108,24 +177,38 @@ PWR: CR4: _delete: SRAM5PDS* _include: + - patches/pwr/add_cr5.yaml - fields/pwr/pwr_u5.yaml +RAMCFG: {} + RCC: + _strip: RCC_ _include: - fields/rcc/rcc_u5.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml +SAES: {} + +SAI1: {} + SDMMC: _strip: SDMMC_ -SPI?: +SPI1: _include: patches/spi/rxtxdr.yaml +SYSCFG: {} + +TAMP: {} + TIM?: _strip: TIM?_ @@ -177,6 +260,8 @@ TIM16: - fields/tim/v3/occe.yaml - collect/tim/ccr.yaml +TSC: {} + USART1: _strip: USART_ _include: @@ -184,8 +269,8 @@ USART1: - patches/usart/add_udr.yaml - fields/usart/v4/C.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: patches/16bit.yaml - -_include: - - patches/u5.yaml diff --git a/devices/stm32u575.yaml b/devices/stm32u575.yaml index 176e7670a..c4cc7c3fe 100644 --- a/devices/stm32u575.yaml +++ b/devices/stm32u575.yaml @@ -1,9 +1,13 @@ _svd: ../svd/stm32u575.svd +_clear_fields: "*" + # This SVD calls this ADC12, but ADC12_Common in most others _modify: ADC12: name: ADC12_Common + ICache: + name: ICACHE ADC12_Common: _strip: ADC12_ @@ -36,6 +40,32 @@ ADC4: name: CHSELR1 alternateRegister: CHSELR0 +ADF1: + _strip: ADF_ + +COMP: {} + +CORDIC: {} + +CRC: {} + +CRS: {} + +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCACHE: + _strip: DCACHE_ + +DCB: {} + +DCMI: {} + +DLYBOS1: + _strip: DLYB_ + DMA2D: _include: - fields/dma/dma2d_v2.yaml @@ -48,18 +78,24 @@ EXTI: FDCAN1_RAM: _strip: FDCAN_ +FLASH: + _strip: FLASH_ + +FMAC: {} + FMC: _include: - patches/fsmc/fsmc_u5.yaml - fields/fsmc/fsmc_sram.yaml - fields/fsmc/fsmc_nand.yaml -GPDMA?: +GPDMA1: _strip: GPDMA_ _include: - collect/dma/gpdma/h7rs_u5.yaml -GPIO?: +GPIO[ABCHI]: + _strip: GPIO_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -69,22 +105,44 @@ GPIO[A]: GPIO[BCHI]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[123]: _strip: MPCBB?_ _include: - collect/gtzc/h5_u5.yaml +GTZC2_MPCBB4: + _strip: MPCBB?_ + _include: + - collect/gtzc/h5_u5.yaml + +GTZC[12]_TZIC: {} + GTZC1_TZSC: _strip: TZSC_ -I2C?: +GTZC2_TZSC: {} + +HASH: {} + +I2C1: _strip: I2C_ _include: - fields/i2c/v3.yaml +ICACHE: + _strip: ICACHE_ + IWDG: _include: patches/16bit.yaml +LPDMA1: + _strip: LPDMA_ + +LPGPIO1: + _strip: LPGPIO_ + +LPTIM[14]: {} + LPUART1: _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml @@ -100,7 +158,18 @@ OCTOSPI[12]: - patches/octospi/u5.yaml - fields/octospi/u5.yaml +OPAMP: {} + +OTFDEC1: {} + +OTG_FS: {} + +PKA: {} + +PSSI: {} + PWR: + _strip: PWR_ CR2: _remove: PKARAMPDS _add: @@ -154,25 +223,37 @@ PWR: bitOffset: 14 bitWidth: 1 _include: + - patches/pwr/add_cr5.yaml - fields/pwr/pwr_u5.yaml +RAMCFG: {} + RCC: + _strip: RCC_ _include: - fields/rcc/rcc_u5.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml +SAES: {} + +SAI1: {} + SDMMC1: _strip: SDMMC_ -SPI?: +SPI1: _strip: SPI_ _include: patches/spi/rxtxdr.yaml +SYSCFG: {} + TAMP: _strip: TAMP_ @@ -227,6 +308,8 @@ TIM16: - fields/tim/v3/occe.yaml - collect/tim/ccr.yaml +TSC: {} + UCPD1: _strip: UCPD_ _include: @@ -240,8 +323,8 @@ USART1: - patches/usart/add_udr.yaml - fields/usart/v4/C.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: patches/16bit.yaml - -_include: - - patches/u5.yaml diff --git a/devices/stm32u585.yaml b/devices/stm32u585.yaml index 8f92c5f52..88db87bed 100644 --- a/devices/stm32u585.yaml +++ b/devices/stm32u585.yaml @@ -1,9 +1,13 @@ _svd: ../svd/stm32u585.svd +_clear_fields: "*" + # This SVD calls this ADC12, but ADC12_Common in most others _modify: ADC12: name: ADC12_Common + ICache: + name: ICACHE ADC12_Common: _strip: ADC12_ @@ -36,6 +40,9 @@ ADC4: name: CHSELR1 alternateRegister: CHSELR0 +ADF1: + _strip: ADF_ + AES: SUSP?R: _modify: @@ -44,6 +51,29 @@ AES: _include: - fields/aes/v3.yaml +COMP: {} + +CORDIC: {} + +CRC: {} + +CRS: {} + +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCACHE: + _strip: DCACHE_ + +DCB: {} + +DCMI: {} + +DLYBOS1: + _strip: DLYB_ + DMA2D: _include: - fields/dma/dma2d_v2.yaml @@ -57,18 +87,24 @@ EXTI: FDCAN1_RAM: _strip: FDCAN_ +FLASH: + _strip: FLASH_ + +FMAC: {} + FMC: _include: - patches/fsmc/fsmc_u5.yaml - fields/fsmc/fsmc_sram.yaml - fields/fsmc/fsmc_nand.yaml -GPDMA?: +GPDMA1: _strip: GPDMA_ _include: - collect/dma/gpdma/h7rs_u5.yaml -GPIO?: +GPIO[ABCHI]: + _strip: GPIO_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -78,22 +114,44 @@ GPIO[A]: GPIO[BCHI]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[123]: _strip: MPCBB?_ _include: - collect/gtzc/h5_u5.yaml +GTZC2_MPCBB4: + _strip: MPCBB?_ + _include: + - collect/gtzc/h5_u5.yaml + +GTZC[12]_TZIC: {} + GTZC1_TZSC: _strip: TZSC_ -I2C?: +GTZC2_TZSC: {} + +HASH: {} + +I2C1: _strip: I2C_ _include: - fields/i2c/v3.yaml +ICACHE: + _strip: ICACHE_ + IWDG: _include: patches/16bit.yaml +LPDMA1: + _strip: LPDMA_ + +LPGPIO1: + _strip: LPGPIO_ + +LPTIM[14]: {} + LPUART1: _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml @@ -109,7 +167,18 @@ OCTOSPI[12]: - patches/octospi/u5.yaml - fields/octospi/u5.yaml +OPAMP: {} + +OTFDEC1: {} + +OTG_FS: {} + +PKA: {} + +PSSI: {} + PWR: + _strip: PWR_ _add: CR4: displayName: PWR control register 4 @@ -161,28 +230,42 @@ PWR: bitOffset: 14 bitWidth: 1 _include: + - patches/pwr/add_cr5.yaml - fields/pwr/pwr_u5.yaml +RAMCFG: {} + RCC: + _strip: RCC_ _include: - fields/rcc/rcc_u5.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml +SAES: {} + +SAI1: {} + SDMMC1: _strip: SDMMC_ -SPI?: +SPI1: _strip: SPI_ _include: patches/spi/rxtxdr.yaml +SYSCFG: {} + TAMP: _strip: TAMP_ +TSC: {} + TIM?: _strip: TIM?_ @@ -247,8 +330,8 @@ USART1: - patches/usart/add_udr.yaml - fields/usart/v4/C.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: patches/16bit.yaml - -_include: - - patches/u5.yaml diff --git a/devices/stm32u595.yaml b/devices/stm32u595.yaml index f8659cbac..274abfab6 100644 --- a/devices/stm32u595.yaml +++ b/devices/stm32u595.yaml @@ -1,5 +1,11 @@ _svd: ../svd/stm32u595.svd +_clear_fields: "*" + +_modify: + ICache: + name: ICACHE + ADC12_Common: _strip: ADC12_ _include: @@ -33,6 +39,32 @@ ADC4: name: CHSELR1 alternateRegister: CHSELR0 +ADF1: + _strip: ADF_ + +COMP: {} + +CORDIC: {} + +CRC: {} + +CRS: {} + +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCACHE1: + _strip: DCACHE_ + +DCB: {} + +DCMI: {} + +DLYBOS1: + _strip: DLYB_ + DMA2D: _include: - fields/dma/dma2d_v2.yaml @@ -45,19 +77,25 @@ EXTI: FDCAN1_RAM: _strip: FDCAN_ +FLASH: + _strip: FLASH_ + +FMAC: {} + FMC: _include: - patches/fsmc/fsmc_u5.yaml - fields/fsmc/fsmc_sram.yaml - fields/fsmc/fsmc_nand.yaml -GPDMA?: +GPDMA1: _strip: GPDMA_ _include: - patches/dma/gpdma_u5_tr1.yaml - collect/dma/gpdma/h7rs_u5.yaml -GPIO?: +GPIO[ABCHIJ]: + _strip: GPIO_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -67,22 +105,44 @@ GPIO[A]: GPIO[BCHIJ]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[1235]: + _strip: MPCBB?_ + _include: + - collect/gtzc/h5_u5.yaml + +GTZC2_MPCBB4: _strip: MPCBB?_ _include: - collect/gtzc/h5_u5.yaml +GTZC[12]_TZIC: {} + GTZC1_TZSC: _strip: TZSC_ -I2C?: +GTZC2_TZSC: {} + +HASH: {} + +I2C1: _strip: I2C_ _include: - fields/i2c/v3.yaml +ICACHE: + _strip: ICACHE_ + IWDG: _include: patches/16bit.yaml +LPDMA1: + _strip: LPDMA_ + +LPGPIO1: + _strip: LPGPIO_ + +LPTIM[14]: {} + LPUART1: _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml @@ -98,7 +158,14 @@ OCTOSPI[12]: - patches/octospi/u5.yaml - fields/octospi/u5.yaml +OPAMP: {} + +OTG_HS: {} + +PSSI: {} + PWR: + _strip: PWR_ CR1: _add: FORCE_USBPWR: @@ -112,24 +179,36 @@ PWR: bitOffset: 21 bitWidth: 1 _include: + - patches/pwr/add_cr5.yaml - fields/pwr/pwr_u5.yaml +RAMCFG: {} + RCC: + _strip: RCC_ _include: - fields/rcc/rcc_u5.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml +SAI1: {} + SDMMC1: _strip: SDMMC_ -SPI?: +SPI1: _include: patches/spi/rxtxdr.yaml +SYSCFG: {} + +TAMP: {} + TIM?: _strip: TIM?_ @@ -181,6 +260,8 @@ TIM16: - fields/tim/v3/occe.yaml - collect/tim/ccr.yaml +TSC: {} + UCPD1: _include: - patches/ucpd/rxordseten_split.yaml @@ -194,8 +275,8 @@ USART1: - patches/usart/add_udr.yaml - fields/usart/v4/C.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: patches/16bit.yaml - -_include: - - patches/u5.yaml diff --git a/devices/stm32u599.yaml b/devices/stm32u599.yaml index cc577a8ad..1bac07154 100644 --- a/devices/stm32u599.yaml +++ b/devices/stm32u599.yaml @@ -1,5 +1,11 @@ _svd: ../svd/stm32u599.svd +_clear_fields: "*" + +_modify: + ICache: + name: ICACHE + ADC12_Common: _strip: ADC12_ _include: @@ -33,6 +39,36 @@ ADC4: name: CHSELR1 alternateRegister: CHSELR0 +ADF1: + _strip: ADF_ + +COMP: {} + +CORDIC: {} + +CRC: {} + +CRS: {} + +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCACHE1: + _strip: DCACHE_ + +DCB: {} + +DCMI: {} + +DLYBOS1: + _strip: DLYB_ + +DMA2D: + _include: + - fields/dma/dma2d_v2.yaml + DSI: _strip: DSI_ @@ -44,6 +80,11 @@ EXTI: FDCAN1_RAM: _strip: FDCAN_ +FLASH: + _strip: FLASH_ + +FMAC: {} + FMC: _include: - patches/fsmc/fsmc_u5.yaml @@ -55,13 +96,14 @@ GFXMMU: _include: - collect/gfxmmu/lut.yaml -GPDMA?: +GPDMA1: _strip: GPDMA_ _include: - patches/dma/gpdma_u5_tr1.yaml - collect/dma/gpdma/h7rs_u5.yaml -GPIO?: +GPIO[ABCHIJ]: + _strip: GPIO_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -71,25 +113,47 @@ GPIO[A]: GPIO[BCHIJ]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[1235]: _strip: MPCBB?_ _include: - collect/gtzc/h5_u5.yaml +GTZC2_MPCBB4: + _strip: MPCBB?_ + _include: + - collect/gtzc/h5_u5.yaml + +GTZC[12]_TZIC: {} + GTZC1_TZSC: _strip: TZSC_ +GTZC2_TZSC: {} + +HASH: {} + HSPI1: _strip: HSPI_ -I2C?: +I2C1: _strip: I2C_ _include: - fields/i2c/v3.yaml +ICACHE: + _strip: ICACHE_ + IWDG: _include: patches/16bit.yaml +LPDMA1: + _strip: LPDMA_ + +LPGPIO1: + _strip: LPGPIO_ + +LPTIM[14]: {} + LPUART1: _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml @@ -108,7 +172,14 @@ OCTOSPI[12]: - patches/octospi/u5.yaml - fields/octospi/u5.yaml +OPAMP: {} + +OTG_HS: {} + +PSSI: {} + PWR: + _strip: PWR_ CR1: _add: FORCE_USBPWR: @@ -120,24 +191,36 @@ PWR: bitOffset: 21 bitWidth: 1 _include: + - patches/pwr/add_cr5.yaml - fields/pwr/pwr_u5.yaml +RAMCFG: {} + RCC: + _strip: RCC_ _include: - fields/rcc/rcc_u5.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml +SAI1: {} + SDMMC1: _strip: SDMMC_ -SPI?: +SPI1: _include: patches/spi/rxtxdr.yaml +SYSCFG: {} + +TAMP: {} + TIM?: _strip: TIM?_ @@ -189,6 +272,8 @@ TIM16: - fields/tim/v3/occe.yaml - collect/tim/ccr.yaml +TSC: {} + UCPD1: _include: - patches/ucpd/rxordseten_split.yaml @@ -202,8 +287,8 @@ USART1: - patches/usart/add_udr.yaml - fields/usart/v4/C.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: patches/16bit.yaml - -_include: - - patches/u5.yaml diff --git a/devices/stm32u5a5.yaml b/devices/stm32u5a5.yaml index b39fa6ce5..b39cf1e17 100644 --- a/devices/stm32u5a5.yaml +++ b/devices/stm32u5a5.yaml @@ -1,5 +1,11 @@ _svd: ../svd/stm32u5a5.svd +_clear_fields: "*" + +_modify: + ICache: + name: ICACHE + ADC12_Common: _strip: ADC12_ _include: @@ -33,6 +39,9 @@ ADC4: name: CHSELR1 alternateRegister: CHSELR0 +ADF1: + _strip: ADF_ + AES: SUSP?R: _modify: @@ -41,6 +50,29 @@ AES: _include: - fields/aes/v3.yaml +COMP: {} + +CORDIC: {} + +CRC: {} + +CRS: {} + +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCACHE1: + _strip: DCACHE_ + +DCB: {} + +DCMI: {} + +DLYBOS1: + _strip: DLYB_ + DMA2D: _include: - fields/dma/dma2d_v2.yaml @@ -53,19 +85,25 @@ EXTI: FDCAN1_RAM: _strip: FDCAN_ +FLASH: + _strip: FLASH_ + +FMAC: {} + FMC: _include: - patches/fsmc/fsmc_u5.yaml - fields/fsmc/fsmc_sram.yaml - fields/fsmc/fsmc_nand.yaml -GPDMA?: +GPDMA1: _strip: GPDMA_ _include: - patches/dma/gpdma_u5_tr1.yaml - collect/dma/gpdma/h7rs_u5.yaml -GPIO?: +GPIO[ABCHIJ]: + _strip: GPIO_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -75,22 +113,44 @@ GPIO[A]: GPIO[BCHIJ]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[1235]: _strip: MPCBB?_ _include: - collect/gtzc/h5_u5.yaml +GTZC2_MPCBB4: + _strip: MPCBB?_ + _include: + - collect/gtzc/h5_u5.yaml + +GTZC[12]_TZIC: {} + GTZC1_TZSC: _strip: TZSC_ -I2C?: +GTZC2_TZSC: {} + +HASH: {} + +I2C1: _strip: I2C_ _include: - fields/i2c/v3.yaml +ICACHE: + _strip: ICACHE_ + IWDG: _include: patches/16bit.yaml +LPDMA1: + _strip: LPDMA_ + +LPGPIO1: + _strip: LPGPIO_ + +LPTIM[14]: {} + LPUART1: _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml @@ -106,7 +166,18 @@ OCTOSPI[12]: - patches/octospi/u5.yaml - fields/octospi/u5.yaml +OPAMP: {} + +OTFDEC1: {} + +OTG_HS: {} + +PKA: {} + +PSSI: {} + PWR: + _strip: PWR_ CR1: _add: FORCE_USBPWR: @@ -120,24 +191,38 @@ PWR: bitOffset: 21 bitWidth: 1 _include: + - patches/pwr/add_cr5.yaml - fields/pwr/pwr_u5.yaml +RAMCFG: {} + RCC: + _strip: RCC_ _include: - fields/rcc/rcc_u5.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml +SAES: {} + +SAI1: {} + SDMMC1: _strip: SDMMC_ -SPI?: +SPI1: _include: patches/spi/rxtxdr.yaml +SYSCFG: {} + +TAMP: {} + TIM?: _strip: TIM?_ @@ -189,6 +274,8 @@ TIM16: - fields/tim/v3/occe.yaml - collect/tim/ccr.yaml +TSC: {} + UCPD1: _include: - patches/ucpd/rxordseten_split.yaml @@ -202,8 +289,8 @@ USART1: - patches/usart/add_udr.yaml - fields/usart/v4/C.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: patches/16bit.yaml - -_include: - - patches/u5.yaml diff --git a/devices/stm32u5a9.yaml b/devices/stm32u5a9.yaml index 9344a6990..2f3896fc7 100644 --- a/devices/stm32u5a9.yaml +++ b/devices/stm32u5a9.yaml @@ -1,5 +1,11 @@ _svd: ../svd/stm32u5a9.svd +_clear_fields: "*" + +_modify: + ICache: + name: ICACHE + ADC12_Common: _strip: ADC12_ _include: @@ -33,6 +39,9 @@ ADC4: name: CHSELR1 alternateRegister: CHSELR0 +ADF1: + _strip: ADF_ + AES: SUSP?R: _modify: @@ -41,6 +50,29 @@ AES: _include: - fields/aes/v3.yaml +COMP: {} + +CORDIC: {} + +CRC: {} + +CRS: {} + +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCACHE1: + _strip: DCACHE_ + +DCB: {} + +DCMI: {} + +DLYBOS1: + _strip: DLYB_ + DMA2D: _include: - fields/dma/dma2d_v2.yaml @@ -56,6 +88,11 @@ EXTI: FDCAN1_RAM: _strip: FDCAN_ +FLASH: + _strip: FLASH_ + +FMAC: {} + FMC: _include: - patches/fsmc/fsmc_u5.yaml @@ -67,13 +104,14 @@ GFXMMU: _include: - collect/gfxmmu/lut.yaml -GPDMA?: +GPDMA1: _strip: GPDMA_ _include: - patches/dma/gpdma_u5_tr1.yaml - collect/dma/gpdma/h7rs_u5.yaml -GPIO?: +GPIO[ABCHIJ]: + _strip: GPIO_ _include: - fields/gpio/gpio_l5_u5.yaml - collect/gpio/v2r.yaml @@ -83,25 +121,47 @@ GPIO[A]: GPIO[BCHIJ]: _include: collect/gpio/v2r_derive.yaml -GTZC1_MPCBB?: +GTZC1_MPCBB[1235]: _strip: MPCBB?_ _include: - collect/gtzc/h5_u5.yaml +GTZC2_MPCBB4: + _strip: MPCBB?_ + _include: + - collect/gtzc/h5_u5.yaml + +GTZC[12]_TZIC: {} + GTZC1_TZSC: _strip: TZSC_ +GTZC2_TZSC: {} + +HASH: {} + HSPI1: _strip: HSPI -I2C?: +I2C1: _strip: I2C_ _include: - fields/i2c/v3.yaml +ICACHE: + _strip: ICACHE_ + IWDG: _include: patches/16bit.yaml +LPDMA1: + _strip: LPDMA_ + +LPGPIO1: + _strip: LPGPIO_ + +LPTIM[14]: {} + LPUART1: _include: - patches/usart/rename_CR1_ISR_enabled_disabled.yaml @@ -120,7 +180,18 @@ OCTOSPI[12]: - patches/octospi/u5.yaml - fields/octospi/u5.yaml +OPAMP: {} + +OTFDEC1: {} + +OTG_HS: {} + +PKA: {} + +PSSI: {} + PWR: + _strip: PWR_ CR1: _add: FORCE_USBPWR: @@ -132,24 +203,38 @@ PWR: bitOffset: 21 bitWidth: 1 _include: + - patches/pwr/add_cr5.yaml - fields/pwr/pwr_u5.yaml +RAMCFG: {} + RCC: + _strip: RCC_ _include: - fields/rcc/rcc_u5.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml +SAES: {} + +SAI1: {} + SDMMC1: _strip: SDMMC_ -SPI?: +SPI1: _include: patches/spi/rxtxdr.yaml +SYSCFG: {} + +TAMP: {} + TIM?: _strip: TIM?_ @@ -201,6 +286,8 @@ TIM16: - fields/tim/v3/occe.yaml - collect/tim/ccr.yaml +TSC: {} + UCPD1: _include: - patches/ucpd/rxordseten_split.yaml @@ -214,8 +301,8 @@ USART1: - patches/usart/add_udr.yaml - fields/usart/v4/C.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: patches/16bit.yaml - -_include: - - patches/u5.yaml diff --git a/devices/stm32wb55.yaml b/devices/stm32wb55.yaml index b070295cd..8434dea80 100644 --- a/devices/stm32wb55.yaml +++ b/devices/stm32wb55.yaml @@ -36,11 +36,23 @@ ADC1: SQR?: SQ*: [0, 18] -AES?: +ADC_Common: {} + +AES[12]: _include: - patches/aes/fields.yaml - fields/aes/v2.yaml +COMP: {} + +CRC: {} + +CRS: {} + +DBGMCU: {} + +DMA[12]: {} + DMAMUX1: _include: - collect/dma/dmamux.yaml @@ -95,7 +107,9 @@ EXTI: C2IMR2: _split: IM -GPIO?: +Flash: {} + +GPIO[ABCEH]: _include: - fields/gpio/v2/common.yaml @@ -115,15 +129,15 @@ HSEM: _include: - collect/hsem/r.yaml +I2C1: + _include: + - fields/i2c/v2.yaml + IPCC: _modify: C1TO2SR: name: C1TOC2SR -I2C?: - _include: - - fields/i2c/v2.yaml - IWDG: _include: patches/16bit.yaml @@ -132,6 +146,12 @@ LCD: _include: - patches/lcd/ram_segment_40.yaml +LPTIM1: {} + +PKA: {} + +PWR: {} + QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml @@ -142,6 +162,8 @@ RCC: - fields/rcc/rcc_wb.yaml - fields/rcc/rcc_wx_c2.yaml +RNG: {} + RTC: _include: - patches/rtc/alarm.yaml @@ -159,7 +181,7 @@ SAI1: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -222,6 +244,8 @@ TIM1[67]: - fields/tim/v2/tim16.yaml - collect/tim/ccr.yaml +TSC: {} + USART1: _include: - patches/usart/merge_CR1_DEDTx_fields.yaml @@ -231,6 +255,8 @@ USART1: - patches/usart/rename_CR2_DATAINV_field.yaml - fields/usart/v4/B.yaml +USB: {} + WWDG: _include: patches/16bit.yaml diff --git a/devices/stm32wl5x_cm0p.yaml b/devices/stm32wl5x_cm0p.yaml index 3b9c857d8..dd8cd06c6 100644 --- a/devices/stm32wl5x_cm0p.yaml +++ b/devices/stm32wl5x_cm0p.yaml @@ -26,6 +26,8 @@ AES: - patches/aes/fields.yaml - fields/aes/v2.yaml +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -40,7 +42,7 @@ DAC: - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml -DMA?: +DMA1: _include: - fields/dma/dma_wl.yaml @@ -59,7 +61,7 @@ FLASH: - fields/flash/flash_wl.yaml - fields/flash/flash_wl_c2.yaml -GPIO?: +GPIO[ABCH]: _include: fields/gpio/v2/common.yaml GPIO[AB]: #CH @@ -78,7 +80,7 @@ HSEM: - fields/hsem/hsem_wl.yaml - collect/hsem/r.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -95,16 +97,17 @@ IWDG: - fields/iwdg/iwdg.yaml - fields/iwdg/iwdg_sr.yaml -LPTIM?: +LPTIM1: _strip: LPTIM?_ _include: - fields/lptim/lptim_v1.yaml - fields/lptim/lptim_wl.yaml -LPTIM1: - _include: - fields/lptim/lptim1_wl.yaml LPTIM[23]: + _strip: LPTIM?_ _include: + - fields/lptim/lptim_v1.yaml + - fields/lptim/lptim_wl.yaml - fields/lptim/lptim2_wl.yaml OR: _merge: OR* @@ -162,7 +165,7 @@ RTC: - fields/rtc/rtc_wl.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -222,6 +225,8 @@ TIM1[67]: - fields/tim/v2/ccm_common.yaml - collect/tim/ccr.yaml +TZIC: {} + TZSC: _strip: TZSC_ diff --git a/devices/stm32wl5x_cm4.yaml b/devices/stm32wl5x_cm4.yaml index 9d4643825..554b5d0d6 100644 --- a/devices/stm32wl5x_cm4.yaml +++ b/devices/stm32wl5x_cm4.yaml @@ -44,6 +44,8 @@ AES: _include: - fields/aes/v2.yaml +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -58,7 +60,9 @@ DAC: - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/dma_wl.yaml @@ -77,7 +81,7 @@ FLASH: - fields/flash/flash_wl.yaml - fields/flash/flash_wl_c2.yaml -GPIO?: +GPIO[ABCH]: _include: - fields/gpio/v2/common.yaml @@ -97,7 +101,7 @@ HSEM: - fields/hsem/hsem_wl.yaml - collect/hsem/r.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -114,16 +118,17 @@ IWDG: - fields/iwdg/iwdg.yaml - fields/iwdg/iwdg_sr.yaml -LPTIM?: +LPTIM1: _strip: LPTIM?_ _include: - fields/lptim/lptim_v1.yaml - fields/lptim/lptim_wl.yaml -LPTIM1: - _include: - fields/lptim/lptim1_wl.yaml LPTIM[23]: + _strip: LPTIM?_ _include: + - fields/lptim/lptim_v1.yaml + - fields/lptim/lptim_wl.yaml - fields/lptim/lptim2_wl.yaml OR: _merge: OR* @@ -181,7 +186,7 @@ RTC: - fields/rtc/rtc_wl.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml @@ -241,6 +246,8 @@ TIM1[67]: - fields/tim/v2/ccm_common.yaml - collect/tim/ccr.yaml +TZIC: {} + TZSC: _strip: TZSC_ diff --git a/devices/stm32wle5.yaml b/devices/stm32wle5.yaml index 5b3ca9cde..3b530f80b 100644 --- a/devices/stm32wle5.yaml +++ b/devices/stm32wle5.yaml @@ -44,6 +44,8 @@ AES: _include: - fields/aes/v2.yaml +COMP: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -58,7 +60,9 @@ DAC: - fields/dac/dac_wl_12bit.yaml - fields/dac/dac_wl_8bit.yaml -DMA?: +DBGMCU: {} + +DMA1: _include: - fields/dma/dma_wl.yaml @@ -106,7 +110,7 @@ FLASH: _include: - fields/flash/flash_wl.yaml -GPIO?: +GPIO[ABCH]: _include: - fields/gpio/v2/common.yaml @@ -144,7 +148,7 @@ HSEM: - fields/hsem/hsem_wl.yaml - collect/hsem/r.yaml -I2C?: +I2C1: _include: - fields/i2c/v2.yaml @@ -156,16 +160,17 @@ IWDG: - fields/iwdg/iwdg.yaml - fields/iwdg/iwdg_sr.yaml -LPTIM?: +LPTIM1: _strip: LPTIM?_ _include: - fields/lptim/lptim_v1.yaml - fields/lptim/lptim_wl.yaml -LPTIM1: - _include: - fields/lptim/lptim1_wl.yaml LPTIM[23]: + _strip: LPTIM?_ _include: + - fields/lptim/lptim_v1.yaml + - fields/lptim/lptim_wl.yaml - fields/lptim/lptim2_wl.yaml OR: _merge: OR* @@ -221,7 +226,7 @@ RTC: - fields/rtc/rtc_wl.yaml - collect/rtc/alarm.yaml -SPI?: +SPI1: _include: - patches/16bit.yaml - patches/spi/dr8.yaml From 112ef36f27ee1906769123ee62aec87770f8b034 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Thu, 6 Feb 2025 22:28:38 +0300 Subject: [PATCH 12/13] H7 --- devices/patches/ethernet/mac_lpiet_3.yaml | 4 + devices/patches/h7_common_bootflash.yaml | 141 --------- devices/patches/h7_common_dualcore.yaml | 119 -------- devices/patches/h7_common_highmemory.yaml | 74 ----- devices/patches/h7_common_singlecore.yaml | 43 --- devices/patches/h7_common_singlecore_735.yaml | 43 --- devices/patches/h7rs_strip.yaml | 167 ----------- devices/patches/pwr/add_step_down.yaml | 14 + devices/patches/pwr/wkupc1246.yaml | 24 ++ devices/patches/ramecc/ramecc.yaml | 147 +++++----- devices/patches/ramecc/ramecc_new.yaml | 5 +- devices/patches/rcc/h7+.yaml | 94 ++++++ devices/patches/sbs/h7+.yaml | 25 ++ devices/patches/syscfg/h73x.yaml | 94 ++++++ devices/stm32h723.yaml | 263 ++++++----------- devices/stm32h725.yaml | 269 ++++++------------ devices/stm32h730.yaml | 263 ++++++----------- devices/stm32h733.yaml | 259 ++++++----------- devices/stm32h735.yaml | 263 ++++++----------- devices/stm32h742.yaml | 94 ++++-- devices/stm32h743.yaml | 94 ++++-- devices/stm32h743v.yaml | 94 ++++-- devices/stm32h745cm4.yaml | 118 ++++++-- devices/stm32h745cm7.yaml | 108 +++++-- devices/stm32h747cm4.yaml | 110 +++++-- devices/stm32h747cm7.yaml | 110 +++++-- devices/stm32h750.yaml | 84 ++++-- devices/stm32h753.yaml | 94 ++++-- devices/stm32h753v.yaml | 92 ++++-- devices/stm32h755cm4.yaml | 114 ++++++-- devices/stm32h755cm7.yaml | 112 ++++++-- devices/stm32h757cm4.yaml | 112 ++++++-- devices/stm32h757cm7.yaml | 108 +++++-- devices/stm32h7a3.yaml | 104 +++++-- devices/stm32h7b0.yaml | 104 ++++++- devices/stm32h7b3.yaml | 106 +++++-- devices/stm32h7r.yaml | 142 ++++++++- devices/stm32h7s.yaml | 154 +++++++++- 38 files changed, 2527 insertions(+), 1838 deletions(-) create mode 100644 devices/patches/ethernet/mac_lpiet_3.yaml delete mode 100644 devices/patches/h7_common_bootflash.yaml delete mode 100644 devices/patches/h7_common_dualcore.yaml delete mode 100644 devices/patches/h7_common_singlecore.yaml delete mode 100644 devices/patches/h7_common_singlecore_735.yaml delete mode 100644 devices/patches/h7rs_strip.yaml create mode 100644 devices/patches/pwr/add_step_down.yaml create mode 100644 devices/patches/pwr/wkupc1246.yaml create mode 100644 devices/patches/rcc/h7+.yaml create mode 100644 devices/patches/sbs/h7+.yaml create mode 100644 devices/patches/syscfg/h73x.yaml diff --git a/devices/patches/ethernet/mac_lpiet_3.yaml b/devices/patches/ethernet/mac_lpiet_3.yaml new file mode 100644 index 000000000..bc464067c --- /dev/null +++ b/devices/patches/ethernet/mac_lpiet_3.yaml @@ -0,0 +1,4 @@ +MACLETR: + _modify: + LPIET: + bitOffset: 3 diff --git a/devices/patches/h7_common_bootflash.yaml b/devices/patches/h7_common_bootflash.yaml deleted file mode 100644 index 138db3ea4..000000000 --- a/devices/patches/h7_common_bootflash.yaml +++ /dev/null @@ -1,141 +0,0 @@ -# Common SVD errors for stm32h7r/s - -_derive: - LPTIM2: LPTIM1 - LPTIM3: LPTIM1 - LPTIM5: LPTIM4 - - TIM3: TIM2 - TIM4: TIM2 - TIM5: TIM2 - TIM7: TIM6 - TIM12: TIM9 - TIM14: TIM13 - TIM17: TIM16 - -RCC: - CFGR: - _modify: - MCO1SEL: - name: MCO1 - MCO2SEL: - name: MCO2 - - PLLCFGR: - _modify: - PLL1DIVPEN: - name: DIVP1EN - PLL1DIVQEN: - name: DIVQ1EN - PLL1DIVREN: - name: DIVR1EN - PLL1DIVSEN: - name: DIVS1EN - PLL1DIVTEN: - name: DIVT1EN - PLL1FRACLE: - name: PLL1FRACEN - - PLL2DIVPEN: - name: DIVP2EN - PLL2DIVQEN: - name: DIVQ2EN - PLL2DIVREN: - name: DIVR2EN - PLL2DIVSEN: - name: DIVS2EN - PLL2DIVTEN: - name: DIVT2EN - PLL2FRACLE: - name: PLL2FRACEN - - PLL3DIVPEN: - name: DIVP3EN - PLL3DIVQEN: - name: DIVQ3EN - PLL3DIVREN: - name: DIVR3EN - PLL3DIVSEN: - name: DIVS3EN - PLL3DIVTEN: - name: DIVT3EN - PLL3FRACLE: - name: PLL3FRACEN - - BMCFGR: - _modify: - BMPRE: - name: HPRE - - AHB1RSTR: - _modify: - ETH1RST: - name: ETH1MACRST - - AHB5RSTR: - _modify: - IOMNGRRST: - name: XSPIMRST - - AHB5ENR: - _modify: - IOMNGREN: - name: XSPIMEN - - CCIPR2: - _modify: - I2C1_I3C1SEL: - name: I2C1I3C1SEL - - _modify: - AHBPERCKSELR: - name: CCIPR1 - APB1PERCKSELR: - name: CCIPR2 - APB2PERCKSELR: - name: CCIPR3 - APB45PERCKSELR: - name: CCIPR4 - APB1RSTR1: - name: APB1LRSTR - APB1RSTR2: - name: APB1HRSTR - APB1ENR1: - name: APB1LENR - APB1ENR2: - name: APB1HENR - APB1LPENR1: - name: APB1LLPENR - APB1LPENR2: - name: APB1HLPENR - -SBS: - CCCSR: - _modify: - COMP_EN: - name: EN - COMP_CODESEL: - name: CS - COMP_RDY: - name: READY - IOHSLV: - name: HSLV - - # align names of EXTI configuration registers with other H7 devices - _modify: - EXTICR3: - name: EXTICR4 - access: read-write - EXTICR2: - name: EXTICR3 - access: read-write - EXTICR1: - name: EXTICR2 - access: read-write - EXTICR0: - name: EXTICR1 - access: read-write - -_include: - - h7rs_strip.yaml - - gpio/h7_mnop.yaml diff --git a/devices/patches/h7_common_dualcore.yaml b/devices/patches/h7_common_dualcore.yaml deleted file mode 100644 index 54d5a4396..000000000 --- a/devices/patches/h7_common_dualcore.yaml +++ /dev/null @@ -1,119 +0,0 @@ -# Common SVD errors for dual core stm32h7x5/7x7 - -# Rename in accordance with other devices and reference manual. -_modify: - Flash: - name: FLASH - -AXI: - _strip: AXI_ - -_delete: - - RAMECC? # RAMECC definitions are so terrible - -Ethernet_DMA: - DMAMR: - _modify: - INTM: - bitWidth: 2 - PR: - access: read-write - TXPR: - access: read-write - DA: - access: read-write - DMASBMR: - _modify: - RB: - access: read-write - MB: - access: read-write - -HRTIM_Common: - _delete: - - BDMADR - _add: - BDMADR: - description: Burst DMA Data register - addressOffset: 0x70 - size: 0x20 - resetValue: 0x00000000 - access: read-write - fields: - BDMADR: - description: Burst DMA Data register - bitOffset: 0 - bitWidth: 32 - -Ethernet_MAC: - MACLETR: - _modify: - LPIET: - bitOffset: 3 - -CEC: - _strip: CEC_ - -CRS: - _strip: CRS_ - -DAC: - _strip: DAC_ - -DMA2D: - _strip: DMA2D_ - -FMC: - _strip: FMC_ - -JPEG: - _strip: JPEG_ - -HSEM: - _strip: HSEM_ - -MDMA: - _strip: MDMA_ - -LPTIM?: - _strip: LPTIM_ - -MDIOS: - _strip: MDIOS_ - -PWR: - _strip: PWR_ - CR3: - _add: - SDEXTRDY: - description: SMPS step-down converter external supply ready - bitOffset: 16 - bitWidth: 1 - SDLEVEL: - description: Step-down converter voltage output level selection - bitOffset: 4 - bitWidth: 2 - SDEXTHP: - description: Step-down converter forced ON and in High Power MR mode - bitOffset: 3 - bitWidth: 1 - -RTC: - _strip: RTC_ - -RNG: - _strip: RNG_ - -I2C1: - _strip: I2C_ - -OTG?_HS_*: - _strip: OTG_HS_ - -FDCAN?: - _strip: FDCAN_ - -WWDG1,WWDG2: - _strip: WWDG_ -IWDG1,IWDG2: - _strip: IWDG_ diff --git a/devices/patches/h7_common_highmemory.yaml b/devices/patches/h7_common_highmemory.yaml index 11bc68c1e..b9658f581 100644 --- a/devices/patches/h7_common_highmemory.yaml +++ b/devices/patches/h7_common_highmemory.yaml @@ -20,9 +20,6 @@ ADC1: _interrupts: - ADC3 -AXI: - _strip: 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. @@ -127,74 +124,3 @@ HRTIM_Common: HRTIM_TIMA: _delete: _interrupts: DMA2_* - -BDMA?: - _strip: BDMA_ - -CEC: - _strip: CEC_ - -CRS: - _strip: CRS_ - -DAC1: - _strip: DAC_ - -DMA2D: - _strip: DMA2D_ - -FMC: - _strip: FMC_ - -JPEG: - _strip: JPEG_ - -HSEM: - _strip: HSEM_ - -MDMA: - _strip: MDMA_ - -LPTIM?: - _strip: LPTIM_ - -MDIOS: - _strip: MDIOS_ - -PWR: - _strip: PWR_ - _delete: - _interrupts: WWDG1_RST # Doesn't exist at all on these parts - -RAMECC: - _add: - _interrupts: - RAMECC: - description: ECC diagnostic global interrupt - value: 145 - -RTC: - _strip: RTC_ - -RNG: - _strip: RNG_ - -I2C3: - _strip: I2C_ - -SDMMC?: - _strip: SDMMC_ - -VREFBUF: - _strip: VREFBUF_ - -OTG?_HS_*: - _strip: OTG_HS_ - -FDCAN?: - _strip: FDCAN_ - -WWDG: - _strip: WWDG_ -IWDG: - _strip: IWDG_ diff --git a/devices/patches/h7_common_singlecore.yaml b/devices/patches/h7_common_singlecore.yaml deleted file mode 100644 index 0067808bb..000000000 --- a/devices/patches/h7_common_singlecore.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# Common SVD errors for single core stm32h742/742/753/750 - -# Rename in accordance with other devices and reference manual. -_modify: - Flash: - name: FLASH - groupName: FLASH - -FLASH: - _modify: - PRAR_PRG2: - addressOffset: 0x12C - alternateRegister: "" - KEYR[12]: - access: write-only - OPTKEYR: - access: write-only - BOOT_PRGR: - access: read-write - -"?~Ethernet_MAC": - MACLETR: - _modify: - LPIET: - bitOffset: 3 - -HSEM: - _strip: HSEM_ - -MDMA: - _strip: MDMA_ - -RTC: - _strip: RTC_ - -AXI: - _strip: AXI_ - -OTG1_HS_*: - _strip: OTG_HS_ - -FDCAN?: - _strip: FDCAN_ diff --git a/devices/patches/h7_common_singlecore_735.yaml b/devices/patches/h7_common_singlecore_735.yaml deleted file mode 100644 index c70bf2e12..000000000 --- a/devices/patches/h7_common_singlecore_735.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# Common SVD errors for single core stm32h735 - -# Rename in accordance with other devices and reference manual. -_modify: - Flash: - name: FLASH - groupName: FLASH - -FLASH: - _modify: - #PRAR_PRG2: - # addressOffset: 0x12C - # alternateRegister: "" - #KEYR[12]: - # access: write-only - OPTKEYR: - access: write-only - #BOOT_PRGR: - # access: read-write - -Ethernet_MAC: - MACLETR: - _modify: - LPIET: - bitOffset: 3 - -HSEM: - _strip: HSEM_ - -MDMA: - _strip: MDMA_ - -RTC: - _strip: RTC_ - -AXI: - _strip: AXI_ - -OTG1_HS_*: - _strip: OTG_HS_ - -FDCAN?: - _strip: FDCAN_ diff --git a/devices/patches/h7rs_strip.yaml b/devices/patches/h7rs_strip.yaml deleted file mode 100644 index fe8a0ad39..000000000 --- a/devices/patches/h7rs_strip.yaml +++ /dev/null @@ -1,167 +0,0 @@ -# All registers start with the peripheral name -# Strip these to follow the same naming convention as other STM32H7 devices - -ADC*: - _strip: ADC_ - -ADF: - _strip: ADF_ - -CEC: - _strip: CEC_ - -CORDIC: - _strip: CORDIC_ - -CRC: - _strip: CRC_ - -CRS: - _strip: CRS_ - -DBGMCU: - _strip: DBGMCU_ - -DCMIPP: - _strip: DCMIPP_ - -DLYB*: - _strip: DLYB_ - -DMA2D: - _strip: DMA2D_ - -DTS: - _strip: DTS_ - -ETH: - _strip: ETH_ - -EXTI: - _strip: EXTI_ - -FDCAN*: - _strip: FDCAN_ - -FLASH: - _strip: FLASH_ - -FMC: - _strip: FMC_ - -GFXMMU: - _strip: GFXMMU_ - -GFXTIM: - _strip: GFXTIM_ - -GPDMA: - _strip: GPDMA_ - -HASH: - _strip: HASH_ - -HPDMA: - _strip: HPDMA_ - -ICACHE: - _strip: ICACHE_ - -IWDG: - _strip: IWDG_ - -I2C*: - _strip: I2C_ - -JPEG: - _strip: JPEG_ - -LPTIM1: - _strip: LPTIM1_ - -LPTIM4: - _strip: LPTIM4_ - -LPUART*: - _strip: LPUART_ - -LTDC: - _strip: LTDC_ - -MDIOS: - _strip: MDIOS_ - -OTG_HS: - _strip: OTG_ - -PSSI: - _strip: PSSI_ - -PWR: - _strip: PWR_ - -RAMCFG: - _strip: RAMECC_ - -RCC: - _strip: RCC_ - -RNG: - _strip: RNG_ - -RTC: - _strip: RTC_ - -SAI*: - _strip: SAI_ - -SBS: - _strip: SBS_ - -SPDIFRX: - _strip: SPDIFRX_ - -SPI*: - _strip: SPI_ - -TAMP: - _strip: TAMP_ - -TIM1: - _strip: TIM1_ - -TIM2: - _strip: TIM2_ - -TIM6: - _strip: TIM6_ - -TIM9: - _strip: TIM9_ - -TIM13: - _strip: TIM13_ - -TIM15: - _strip: TIM15_ - -TIM16: - _strip: TIM16_ - -UCPD: - _strip: UCPD_ - -USART*: - _strip: USART_ - -VREFBUF: - _strip: VREFBUF_ - -WWDG: - _strip: WWDG_ - -XSPI*: - _strip: XSPI_ - -XSPIM*: - _strip: XSPIM_ diff --git a/devices/patches/pwr/add_step_down.yaml b/devices/patches/pwr/add_step_down.yaml new file mode 100644 index 000000000..4540a6d78 --- /dev/null +++ b/devices/patches/pwr/add_step_down.yaml @@ -0,0 +1,14 @@ +CR3: + _add: + SDEXTHP: + description: SMPS step-down converter forced ON and in High Power MR mode + bitOffset: 3 + bitWidth: 1 + SDLEVEL: + description: SMPS step-down converter voltage output level selection + bitOffset: 4 + bitWidth: 2 + SDEXTRDY: + description: SMPS step-down converter external supply ready + bitOffset: 16 + bitWidth: 1 diff --git a/devices/patches/pwr/wkupc1246.yaml b/devices/patches/pwr/wkupc1246.yaml new file mode 100644 index 000000000..793683e55 --- /dev/null +++ b/devices/patches/pwr/wkupc1246.yaml @@ -0,0 +1,24 @@ +WKUPCR: + _delete: + - WKUPC + _add: + WKUPC1: + description: Clear Wakeup pin flag for WKUPC1 + bitWidth: 1 + bitOffset: 0 + WKUPC2: + description: Clear Wakeup pin flag for WKUPC2 + bitWidth: 1 + bitOffset: 1 + WKUPC4: + description: Clear Wakeup pin flag for WKUPC4 + bitWidth: 1 + bitOffset: 3 + WKUPC6: + description: Clear Wakeup pin flag for WKUPC6 + bitWidth: 1 + bitOffset: 5 +WKUPFR: + _delete: + - WKUPF3 + - WKUPF5 diff --git a/devices/patches/ramecc/ramecc.yaml b/devices/patches/ramecc/ramecc.yaml index 43cf6c65e..3a90d80ac 100644 --- a/devices/patches/ramecc/ramecc.yaml +++ b/devices/patches/ramecc/ramecc.yaml @@ -1,77 +1,76 @@ # RAMECC # Strip all monitor registers of their fields, then add the correct fields -"RAMECC,RAMECC?": - M?CR: - _delete: ?* - _add: - ECCELEN: - description: ECC error context latching enable - bitOffset: 5 - bitWidth: 1 - access: read-write - ECCDEBWIE: - description: ECC double error on byte write interrupt enable - bitOffset: 4 - bitWidth: 1 - access: read-write - ECCDEIE: - description: ECC double error interrupt enable - bitOffset: 3 - bitWidth: 1 - access: read-write - ECCSEIE: - description: ECC single error interrupt enable - bitOffset: 2 - bitWidth: 1 - access: read-write - M?SR: - _delete: ?* - _add: - DEBWDF: - description: ECC double error on byte write flag - bitOffset: 2 - bitWidth: 1 - access: read-write - DEDF: - description: ECC double error detected flag - bitOffset: 1 - bitWidth: 1 - access: read-write - SEDCF: - description: ECC single error detected flag - bitOffset: 0 - bitWidth: 1 - access: read-write - M?FAR: - _delete: ?* - _add: - FADD: - description: ECC failing address - bitOffset: 0 - bitWidth: 32 - access: read-only - M?FDRL: - _delete: ?* - _add: - FDATAL: - description: ECC failing data low - bitOffset: 0 - bitWidth: 32 - access: read-only - M?FDRH: - _delete: ?* - _add: - FDATAH: - description: ECC failing data high - bitOffset: 0 - bitWidth: 32 - access: read-only - M?FECR: - _delete: ?* - _add: - FEC: - description: ECC failing code - bitOffset: 0 - bitWidth: 32 - access: read-only +M?CR: + _delete: ?* + _add: + ECCELEN: + description: ECC error context latching enable + bitOffset: 5 + bitWidth: 1 + access: read-write + ECCDEBWIE: + description: ECC double error on byte write interrupt enable + bitOffset: 4 + bitWidth: 1 + access: read-write + ECCDEIE: + description: ECC double error interrupt enable + bitOffset: 3 + bitWidth: 1 + access: read-write + ECCSEIE: + description: ECC single error interrupt enable + bitOffset: 2 + bitWidth: 1 + access: read-write +M?SR: + _delete: ?* + _add: + DEBWDF: + description: ECC double error on byte write flag + bitOffset: 2 + bitWidth: 1 + access: read-write + DEDF: + description: ECC double error detected flag + bitOffset: 1 + bitWidth: 1 + access: read-write + SEDCF: + description: ECC single error detected flag + bitOffset: 0 + bitWidth: 1 + access: read-write +M?FAR: + _delete: ?* + _add: + FADD: + description: ECC failing address + bitOffset: 0 + bitWidth: 32 + access: read-only +M?FDRL: + _delete: ?* + _add: + FDATAL: + description: ECC failing data low + bitOffset: 0 + bitWidth: 32 + access: read-only +M?FDRH: + _delete: ?* + _add: + FDATAH: + description: ECC failing data high + bitOffset: 0 + bitWidth: 32 + access: read-only +M?FECR: + _delete: ?* + _add: + FEC: + description: ECC failing code + bitOffset: 0 + bitWidth: 32 + access: read-only diff --git a/devices/patches/ramecc/ramecc_new.yaml b/devices/patches/ramecc/ramecc_new.yaml index f39a8de3d..6d1f07974 100644 --- a/devices/patches/ramecc/ramecc_new.yaml +++ b/devices/patches/ramecc/ramecc_new.yaml @@ -1,8 +1,9 @@ # RAMECC peripheral from scratch # ramecc.yaml adds monitor fields -_include: - - ramecc.yaml +"RAMECC,RAMECC?": + _include: + - ramecc.yaml _add: RAMECC1: diff --git a/devices/patches/rcc/h7+.yaml b/devices/patches/rcc/h7+.yaml new file mode 100644 index 000000000..7c7d3d119 --- /dev/null +++ b/devices/patches/rcc/h7+.yaml @@ -0,0 +1,94 @@ +CFGR: + _modify: + MCO1SEL: + name: MCO1 + MCO2SEL: + name: MCO2 + +PLLCFGR: + _modify: + PLL1DIVPEN: + name: DIVP1EN + PLL1DIVQEN: + name: DIVQ1EN + PLL1DIVREN: + name: DIVR1EN + PLL1DIVSEN: + name: DIVS1EN + PLL1DIVTEN: + name: DIVT1EN + PLL1FRACLE: + name: PLL1FRACEN + + PLL2DIVPEN: + name: DIVP2EN + PLL2DIVQEN: + name: DIVQ2EN + PLL2DIVREN: + name: DIVR2EN + PLL2DIVSEN: + name: DIVS2EN + PLL2DIVTEN: + name: DIVT2EN + PLL2FRACLE: + name: PLL2FRACEN + + PLL3DIVPEN: + name: DIVP3EN + PLL3DIVQEN: + name: DIVQ3EN + PLL3DIVREN: + name: DIVR3EN + PLL3DIVSEN: + name: DIVS3EN + PLL3DIVTEN: + name: DIVT3EN + PLL3FRACLE: + name: PLL3FRACEN + +BMCFGR: + _modify: + BMPRE: + name: HPRE + +AHB1RSTR: + _modify: + ETH1RST: + name: ETH1MACRST + +AHB5RSTR: + _modify: + IOMNGRRST: + name: XSPIMRST + +AHB5ENR: + _modify: + IOMNGREN: + name: XSPIMEN + +CCIPR2: + _modify: + I2C1_I3C1SEL: + name: I2C1I3C1SEL + +_modify: + AHBPERCKSELR: + name: CCIPR1 + APB1PERCKSELR: + name: CCIPR2 + APB2PERCKSELR: + name: CCIPR3 + APB45PERCKSELR: + name: CCIPR4 + APB1RSTR1: + name: APB1LRSTR + APB1RSTR2: + name: APB1HRSTR + APB1ENR1: + name: APB1LENR + APB1ENR2: + name: APB1HENR + APB1LPENR1: + name: APB1LLPENR + APB1LPENR2: + name: APB1HLPENR diff --git a/devices/patches/sbs/h7+.yaml b/devices/patches/sbs/h7+.yaml new file mode 100644 index 000000000..8cbc7882b --- /dev/null +++ b/devices/patches/sbs/h7+.yaml @@ -0,0 +1,25 @@ +CCCSR: + _modify: + COMP_EN: + name: EN + COMP_CODESEL: + name: CS + COMP_RDY: + name: READY + IOHSLV: + name: HSLV + +# align names of EXTI configuration registers with other H7 devices +_modify: + EXTICR3: + name: EXTICR4 + access: read-write + EXTICR2: + name: EXTICR3 + access: read-write + EXTICR1: + name: EXTICR2 + access: read-write + EXTICR0: + name: EXTICR1 + access: read-write diff --git a/devices/patches/syscfg/h73x.yaml b/devices/patches/syscfg/h73x.yaml new file mode 100644 index 000000000..541bd4b3c --- /dev/null +++ b/devices/patches/syscfg/h73x.yaml @@ -0,0 +1,94 @@ +_add: + CFGR: + description: Timer break lockup register + addressOffset: 0x18 + resetValue: 0x00000000 + fields: + PVDL: + description: Programmable voltage detector lockup bit + bitOffset: 2 + bitWidth: 1 + FLASHL: + description: FLASH double error lockup bit + bitOffset: 3 + bitWidth: 1 + CM7L: + description: CPU lockup bit + bitOffset: 6 + bitWidth: 1 + BKRAML: + description: Backup RAM Double error lockup bit + bitOffset: 7 + bitWidth: 1 + SRAM4L: + description: SRAM4 Double error lockup bit + bitOffset: 9 + bitWidth: 1 + SRAM2L: + description: SRAM2 Double error lockup bit + bitOffset: 11 + bitWidth: 1 + SRAM1L: + description: SRAM1 Double error lockup bit + bitOffset: 12 + bitWidth: 1 + DTCML: + description: DTCM-RAM Double error lockup bit + bitOffset: 13 + bitWidth: 1 + ITCML: + description: ITCM-RAM Double error lockup bit + bitOffset: 14 + bitWidth: 1 + AXIRAML: + description: AXISRAM Double error lockup bit + bitOffset: 15 + bitWidth: 1 + ADC2ALT: + description: ADC2 internal input alternate connection + addressOffset: 0x30 + resetValue: 0x00000000 + fields: + ADC2_ROUT1: + description: ADC2 V_INP17 alternate connection + bitOffset: 1 + bitWidth: 1 + ADC2_ROUT0: + description: ADC2 V_INP16 alternate connection + bitOffset: 0 + bitWidth: 1 + UR18: + description: SYSCFG user register 18 + addressOffset: 0x348 + access: read-only + fields: + CPU_FREQ_BOOST: + description: CPU maximum frequency boost + bitOffset: 0 + bitWidth: 1 +_delete: + - UR8 # Only one flash bank + - UR9 + - UR10 +PMCR: + _add: + BOOSTVDDSEL: + description: Analog switch supply voltage selection + bitWidth: 1 + bitOffset: 9 + I2C5FMP: + description: I2C5 Fm+ + bitWidth: 1 + bitOffset: 10 +UR0: + _delete: + - BKS +UR11: + _delete: + - SA_END_2 +UR17: + _add: + TCM_AXI_SHARED_CFG: + description: ITCM-RAM/AXI-SRAM size + bitOffset: 16 + bitWidth: 2 diff --git a/devices/stm32h723.yaml b/devices/stm32h723.yaml index 673643ee8..d5b29407a 100644 --- a/devices/stm32h723.yaml +++ b/devices/stm32h723.yaml @@ -29,8 +29,11 @@ _modify: offset: 0x0 size: 0x100 usage: registers + Flash: + name: FLASH + groupName: FLASH -ADC*_Common: +ADC12_Common,ADC3_Common: _strip: ADC_ #_include: fields/adc/adc_v3_common_h7.yaml CCR: @@ -56,6 +59,7 @@ ADC1: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -65,10 +69,14 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: _include: - fields/hdmi_cec.yaml +COMP1: {} + CORDIC: _strip: CORDIC_ _include: @@ -82,23 +90,52 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + +DAC: {} + +# Modify the DBGMCU.CR register fields names to be consistent with RM0468. +# TODO: Interesting aside: the svd lists these controls additionally for D2 and +# D3, while the RM0468 specifies those as reserved bits, while still having +# clock controls specified for D2, D3. Thus, it may not be unthinkable that +# the same name changes need to be done for D2, D3, even though the reference +# manual does not specify them. OR: perhaps remove the D2, D3 fields instead? +DBGMCU: + CR: + _modify: + DBGSTBD1: + name: DBGSTBY_D1 + DBGSTPD1: + name: DBGSTOP_D1 + DBGSLPD1: + name: DBGSLEEP_D1 + +DCMI: + _modify: + _interrupts: + DCMI: + name: DCMI_PSSI + description: DCMI/PSSI global interrupt + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX_ _include: @@ -114,38 +151,29 @@ DMAMUX2: - fields/dma/dmamux2_v1.yaml - collect/dma/h7_dmamux.yaml -# Modify the DBGMCU.CR register fields names to be consistent with RM0468. -# TODO: Interesting aside: the svd lists these controls additionally for D2 and -# D3, while the RM0468 specifies those as reserved bits, while still having -# clock controls specified for D2, D3. Thus, it may not be unthinkable that -# the same name changes need to be done for D2, D3, even though the reference -# manual does not specify them. OR: perhaps remove the D2, D3 fields instead? -DBGMCU: - CR: - _modify: - DBGSTBD1: - name: DBGSTBY_D1 - DBGSTPD1: - name: DBGSTOP_D1 - DBGSLPD1: - name: DBGSLEEP_D1 +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml -DCMI: - _modify: - _interrupts: - DCMI: - name: DCMI_PSSI - description: DCMI/PSSI global interrupt +Ethernet_DMA: {} + +Ethernet_MTL: {} EXTI: _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml +FLASH: + _modify: + OPTKEYR: + access: write-only + FMAC: _strip: FMAC_ @@ -156,7 +184,7 @@ FMC: GPIOA: _strip: GPIOA_ -GPIO?: +GPIO[ABCJK]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -168,10 +196,11 @@ GPIO[BCJK]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml @@ -181,7 +210,7 @@ IWDG1: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +LPTIM[13]: _include: - fields/lptim/lptim_v1.yaml @@ -204,19 +233,27 @@ MDIOS: _strip: MDIOS_ MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml # OCTOSPI blocks -OCTOSPI?: +OCTOSPI1: AR: _modify: ADRESS: name: ADDRESS -OTG?_HS_*: +OctoSPII_O_Manager: {} + +OPAMP: {} + +OTG1_HS_*: _strip: OTG_HS_ +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_GLOBAL: _include: patches/usb_otg/hsglobal.yaml _add: @@ -237,52 +274,18 @@ OTG1_HS_GLOBAL: OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} + +PSSI: + _strip: PSSI_ # PWR block PWR: - CR3: - _add: - SDEXTHP: - description: SMPS step-down converter forced ON and in High Power MR mode - bitWidth: 1 - bitOffset: 3 - SDLEVEL: - description: SMPS step-down converter voltage output level selection - bitWidth: 2 - bitOffset: 4 - SDEXTRDY: - description: SMPS step-down converter external supply ready - bitWidth: 1 - bitOffset: 16 - WKUPCR: - _delete: - - WKUPC - _add: - WKUPC1: - description: Clear Wakeup pin flag for WKUPC1 - bitWidth: 1 - bitOffset: 0 - WKUPC2: - description: Clear Wakeup pin flag for WKUPC2 - bitWidth: 1 - bitOffset: 1 - WKUPC4: - description: Clear Wakeup pin flag for WKUPC4 - bitWidth: 1 - bitOffset: 3 - WKUPC6: - description: Clear Wakeup pin flag for WKUPC6 - bitWidth: 1 - bitOffset: 5 - WKUPFR: - _delete: - - WKUPF3 - - WKUPF5 + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/wkupc1246.yaml -PSSI: - _strip: PSSI_ +RAMECC[123]: {} # RCC block RCC: @@ -310,6 +313,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -317,7 +321,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -326,10 +330,12 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SDMMC?: +SDMMC1: _strip: SDMMC_ -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -337,102 +343,12 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + # SYSCFG block SYSCFG: - _add: - CFGR: - description: Timer break lockup register - addressOffset: 0x18 - resetValue: 0x00000000 - fields: - PVDL: - description: Programmable voltage detector lockup bit - bitOffset: 2 - bitWidth: 1 - FLASHL: - description: FLASH double error lockup bit - bitOffset: 3 - bitWidth: 1 - CM7L: - description: CPU lockup bit - bitOffset: 6 - bitWidth: 1 - BKRAML: - description: Backup RAM Double error lockup bit - bitOffset: 7 - bitWidth: 1 - SRAM4L: - description: SRAM4 Double error lockup bit - bitOffset: 9 - bitWidth: 1 - SRAM2L: - description: SRAM2 Double error lockup bit - bitOffset: 11 - bitWidth: 1 - SRAM1L: - description: SRAM1 Double error lockup bit - bitOffset: 12 - bitWidth: 1 - DTCML: - description: DTCM-RAM Double error lockup bit - bitOffset: 13 - bitWidth: 1 - ITCML: - description: ITCM-RAM Double error lockup bit - bitOffset: 14 - bitWidth: 1 - AXIRAML: - description: AXISRAM Double error lockup bit - bitOffset: 15 - bitWidth: 1 - ADC2ALT: - description: ADC2 internal input alternate connection - addressOffset: 0x30 - resetValue: 0x00000000 - fields: - ADC2_ROUT1: - description: ADC2 V_INP17 alternate connection - bitOffset: 1 - bitWidth: 1 - ADC2_ROUT0: - description: ADC2 V_INP16 alternate connection - bitOffset: 0 - bitWidth: 1 - UR18: - description: SYSCFG user register 18 - addressOffset: 0x348 - access: read-only - fields: - CPU_FREQ_BOOST: - description: CPU maximum frequency boost - bitOffset: 0 - bitWidth: 1 - _delete: - - UR8 # Only one flash bank - - UR9 - - UR10 - PMCR: - _add: - BOOSTVDDSEL: - description: Analog switch supply voltage selection - bitWidth: 1 - bitOffset: 9 - I2C5FMP: - description: I2C5 Fm+ - bitWidth: 1 - bitOffset: 10 - UR0: - _delete: - - BKS - UR11: - _delete: - - SA_END_2 - UR17: - _add: - TCM_AXI_SHARED_CFG: - description: ITCM-RAM/AXI-SRAM size - bitOffset: 16 - bitWidth: 2 + _include: + - patches/syscfg/h73x.yaml TIM1: _modify: @@ -507,6 +423,8 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: _include: - patches/wwdg/h7.yaml @@ -515,7 +433,6 @@ WWDG1: # ----------------------------------------------------------------------------- _include: - - patches/h7_common_singlecore_735.yaml - patches/ethernet/h7_combined_desc.yaml - collect/usb_otg/hs.yaml - patches/gpio/h7_jk.yaml diff --git a/devices/stm32h725.yaml b/devices/stm32h725.yaml index e429aab33..a71608ccb 100644 --- a/devices/stm32h725.yaml +++ b/devices/stm32h725.yaml @@ -29,8 +29,11 @@ _modify: offset: 0x0 size: 0x100 usage: registers + Flash: + name: FLASH + groupName: FLASH -ADC*_Common: +ADC12_Common,ADC3_Common: _strip: ADC_ #_include: fields/adc/adc_v3_common_h7.yaml CCR: @@ -56,6 +59,7 @@ ADC1: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -65,15 +69,19 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml -CORDIC: - _strip: CORDIC_ - _include: - - fields/cordic/v1.yaml +CAN_CCU: {} CEC: _include: - fields/hdmi_cec.yaml +COMP1: {} + +CORDIC: + _strip: CORDIC_ + _include: + - fields/cordic/v1.yaml + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -82,32 +90,9 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +CRS: {} -DMA?: - _include: - - patches/dma/fcr_wo.yaml - - patches/dma/h7_dmacr.yaml - - fields/dma/dma_v3.yaml - - collect/dma/st.yaml - -DMAMUX1: - _strip: DMAMUX_ - _include: - - fields/dma/dmamux_v1.yaml - - fields/dma/dmamux1_v1.yaml - - collect/dma/h7_dmamux.yaml - -DMAMUX2: - _strip: DMAMUX?_ - _include: - - patches/dma/h7_dmamux.yaml - - fields/dma/dmamux_v1.yaml - - fields/dma/dmamux2_v1.yaml - - collect/dma/h7_dmamux.yaml +DAC: {} # Modify the DBGMCU.CR register fields names to be consistent with RM0468. # TODO: Interesting aside: the svd lists these controls additionally for D2 and @@ -137,15 +122,58 @@ DFSDM: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml +DELAY_Block_SDMMC1: {} + +DMA1: + _include: + - patches/dma/fcr_wo.yaml + - patches/dma/h7_dmacr.yaml + - fields/dma/dma_v3.yaml + - collect/dma/st.yaml + +DMA2D: + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + +DMAMUX1: + _strip: DMAMUX_ + _include: + - fields/dma/dmamux_v1.yaml + - fields/dma/dmamux1_v1.yaml + - collect/dma/h7_dmamux.yaml + +DMAMUX2: + _strip: DMAMUX?_ + _include: + - patches/dma/h7_dmamux.yaml + - fields/dma/dmamux_v1.yaml + - fields/dma/dmamux2_v1.yaml + - collect/dma/h7_dmamux.yaml + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_DMA: {} + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml +FLASH: + _modify: + OPTKEYR: + access: write-only + FMAC: _strip: FMAC_ @@ -156,7 +184,7 @@ FMC: GPIOA: _strip: GPIOA_ -GPIO?: +GPIO[ABCJK]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -168,10 +196,11 @@ GPIO[BCJK]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml @@ -181,7 +210,7 @@ IWDG1: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +LPTIM[13]: _include: - fields/lptim/lptim_v1.yaml @@ -204,22 +233,30 @@ MDIOS: _strip: MDIOS_ MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml # OCTOSPI blocks -OCTOSPI?: +OCTOSPI1: AR: _modify: ADRESS: name: ADDRESS +OctoSPII_O_Manager: {} + +OPAMP: {} + OTFDEC1: _strip: OTFDEC_ -OTG?_HS_*: +OTG1_HS_*: _strip: OTG_HS_ +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_GLOBAL: _include: patches/usb_otg/hsglobal.yaml _add: @@ -240,52 +277,18 @@ OTG1_HS_GLOBAL: OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} + +PSSI: + _strip: PSSI_ # PWR block PWR: - CR3: - _add: - SDEXTHP: - description: SMPS step-down converter forced ON and in High Power MR mode - bitWidth: 1 - bitOffset: 3 - SDLEVEL: - description: SMPS step-down converter voltage output level selection - bitWidth: 2 - bitOffset: 4 - SDEXTRDY: - description: SMPS step-down converter external supply ready - bitWidth: 1 - bitOffset: 16 - WKUPCR: - _delete: - - WKUPC - _add: - WKUPC1: - description: Clear Wakeup pin flag for WKUPC1 - bitWidth: 1 - bitOffset: 0 - WKUPC2: - description: Clear Wakeup pin flag for WKUPC2 - bitWidth: 1 - bitOffset: 1 - WKUPC4: - description: Clear Wakeup pin flag for WKUPC4 - bitWidth: 1 - bitOffset: 3 - WKUPC6: - description: Clear Wakeup pin flag for WKUPC6 - bitWidth: 1 - bitOffset: 5 - WKUPFR: - _delete: - - WKUPF3 - - WKUPF5 + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/wkupc1246.yaml -PSSI: - _strip: PSSI_ +RAMECC[123]: {} # RCC block RCC: @@ -313,6 +316,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -320,7 +324,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -329,10 +333,12 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SDMMC?: +SDMMC1: _strip: SDMMC_ -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -340,102 +346,12 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + # SYSCFG block SYSCFG: - _add: - CFGR: - description: Timer break lockup register - addressOffset: 0x18 - resetValue: 0x00000000 - fields: - PVDL: - description: Programmable voltage detector lockup bit - bitOffset: 2 - bitWidth: 1 - FLASHL: - description: FLASH double error lockup bit - bitOffset: 3 - bitWidth: 1 - CM7L: - description: CPU lockup bit - bitOffset: 6 - bitWidth: 1 - BKRAML: - description: Backup RAM Double error lockup bit - bitOffset: 7 - bitWidth: 1 - SRAM4L: - description: SRAM4 Double error lockup bit - bitOffset: 9 - bitWidth: 1 - SRAM2L: - description: SRAM2 Double error lockup bit - bitOffset: 11 - bitWidth: 1 - SRAM1L: - description: SRAM1 Double error lockup bit - bitOffset: 12 - bitWidth: 1 - DTCML: - description: DTCM-RAM Double error lockup bit - bitOffset: 13 - bitWidth: 1 - ITCML: - description: ITCM-RAM Double error lockup bit - bitOffset: 14 - bitWidth: 1 - AXIRAML: - description: AXISRAM Double error lockup bit - bitOffset: 15 - bitWidth: 1 - ADC2ALT: - description: ADC2 internal input alternate connection - addressOffset: 0x30 - resetValue: 0x00000000 - fields: - ADC2_ROUT1: - description: ADC2 V_INP17 alternate connection - bitOffset: 1 - bitWidth: 1 - ADC2_ROUT0: - description: ADC2 V_INP16 alternate connection - bitOffset: 0 - bitWidth: 1 - UR18: - description: SYSCFG user register 18 - addressOffset: 0x348 - access: read-only - fields: - CPU_FREQ_BOOST: - description: CPU maximum frequency boost - bitOffset: 0 - bitWidth: 1 - _delete: - - UR8 # Only one flash bank - - UR9 - - UR10 - PMCR: - _add: - BOOSTVDDSEL: - description: Analog switch supply voltage selection - bitWidth: 1 - bitOffset: 9 - I2C5FMP: - description: I2C5 Fm+ - bitWidth: 1 - bitOffset: 10 - UR0: - _delete: - - BKS - UR11: - _delete: - - SA_END_2 - UR17: - _add: - TCM_AXI_SHARED_CFG: - description: ITCM-RAM/AXI-SRAM size - bitOffset: 16 - bitWidth: 2 + _include: + - patches/syscfg/h73x.yaml TIM1: _modify: @@ -510,6 +426,8 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: _include: - patches/wwdg/h7.yaml @@ -518,7 +436,6 @@ WWDG1: # ----------------------------------------------------------------------------- _include: - - patches/h7_common_singlecore_735.yaml - patches/ethernet/h7_combined_desc.yaml - collect/usb_otg/hs.yaml - patches/gpio/h7_jk.yaml diff --git a/devices/stm32h730.yaml b/devices/stm32h730.yaml index d9ad149c3..2314ffc8e 100644 --- a/devices/stm32h730.yaml +++ b/devices/stm32h730.yaml @@ -29,8 +29,11 @@ _modify: offset: 0x0 size: 0x100 usage: registers + Flash: + name: FLASH + groupName: FLASH -ADC*_Common: +ADC12_Common,ADC3_Common: _strip: ADC_ #_include: fields/adc/adc_v3_common_h7.yaml CCR: @@ -56,6 +59,7 @@ ADC1: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -65,10 +69,14 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: _include: - fields/hdmi_cec.yaml +COMP1: {} + CORDIC: _strip: CORDIC_ _include: @@ -82,6 +90,8 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + # Merge the hundreds of individual bit fields into single fields for the # crypt key/iv registers. CRYP: @@ -90,32 +100,7 @@ CRYP: "IV[01][LR]R": _merge: IV* -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml - -DMA?: - _include: - - patches/dma/fcr_wo.yaml - - patches/dma/h7_dmacr.yaml - - fields/dma/dma_v3.yaml - - collect/dma/st.yaml - -DMAMUX1: - _strip: DMAMUX_ - _include: - - fields/dma/dmamux_v1.yaml - - fields/dma/dmamux1_v1.yaml - - collect/dma/h7_dmamux.yaml - -DMAMUX2: - _strip: DMAMUX?_ - _include: - - patches/dma/h7_dmamux.yaml - - fields/dma/dmamux_v1.yaml - - fields/dma/dmamux2_v1.yaml - - collect/dma/h7_dmamux.yaml +DAC: {} # Modify the DBGMCU.CR register fields names to be consistent with RM0468. # TODO: Interesting aside: the svd lists these controls additionally for D2 and @@ -145,15 +130,58 @@ DFSDM: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml +DELAY_Block_SDMMC1: {} + +DMA1: + _include: + - patches/dma/fcr_wo.yaml + - patches/dma/h7_dmacr.yaml + - fields/dma/dma_v3.yaml + - collect/dma/st.yaml + +DMA2D: + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + +DMAMUX1: + _strip: DMAMUX_ + _include: + - fields/dma/dmamux_v1.yaml + - fields/dma/dmamux1_v1.yaml + - collect/dma/h7_dmamux.yaml + +DMAMUX2: + _strip: DMAMUX?_ + _include: + - patches/dma/h7_dmamux.yaml + - fields/dma/dmamux_v1.yaml + - fields/dma/dmamux2_v1.yaml + - collect/dma/h7_dmamux.yaml + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_DMA: {} + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml +FLASH: + _modify: + OPTKEYR: + access: write-only + FMAC: _strip: FMAC_ @@ -164,7 +192,7 @@ FMC: GPIOA: _strip: GPIOA_ -GPIO?: +GPIO[ABCJK]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -176,10 +204,11 @@ GPIO[BCJK]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml @@ -189,7 +218,7 @@ IWDG1: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +LPTIM[13]: _include: - fields/lptim/lptim_v1.yaml @@ -212,22 +241,30 @@ MDIOS: _strip: MDIOS_ MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml # OCTOSPI blocks -OCTOSPI?: +OCTOSPI1: AR: _modify: ADRESS: name: ADDRESS +OctoSPII_O_Manager: {} + +OPAMP: {} + OTFDEC1: _strip: OTFDEC_ -OTG?_HS_*: +OTG1_HS_*: _strip: OTG_HS_ +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_GLOBAL: _include: patches/usb_otg/hsglobal.yaml _add: @@ -248,52 +285,18 @@ OTG1_HS_GLOBAL: OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} + +PSSI: + _strip: PSSI_ # PWR block PWR: - CR3: - _add: - SDEXTHP: - description: SMPS step-down converter forced ON and in High Power MR mode - bitWidth: 1 - bitOffset: 3 - SDLEVEL: - description: SMPS step-down converter voltage output level selection - bitWidth: 2 - bitOffset: 4 - SDEXTRDY: - description: SMPS step-down converter external supply ready - bitWidth: 1 - bitOffset: 16 - WKUPCR: - _delete: - - WKUPC - _add: - WKUPC1: - description: Clear Wakeup pin flag for WKUPC1 - bitWidth: 1 - bitOffset: 0 - WKUPC2: - description: Clear Wakeup pin flag for WKUPC2 - bitWidth: 1 - bitOffset: 1 - WKUPC4: - description: Clear Wakeup pin flag for WKUPC4 - bitWidth: 1 - bitOffset: 3 - WKUPC6: - description: Clear Wakeup pin flag for WKUPC6 - bitWidth: 1 - bitOffset: 5 - WKUPFR: - _delete: - - WKUPF3 - - WKUPF5 + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/wkupc1246.yaml -PSSI: - _strip: PSSI_ +RAMECC[123]: {} # RCC block RCC: @@ -321,6 +324,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -328,7 +332,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -337,10 +341,12 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SDMMC?: +SDMMC1: _strip: SDMMC_ -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -348,102 +354,12 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + # SYSCFG block SYSCFG: - _add: - CFGR: - description: Timer break lockup register - addressOffset: 0x18 - resetValue: 0x00000000 - fields: - PVDL: - description: Programmable voltage detector lockup bit - bitOffset: 2 - bitWidth: 1 - FLASHL: - description: FLASH double error lockup bit - bitOffset: 3 - bitWidth: 1 - CM7L: - description: CPU lockup bit - bitOffset: 6 - bitWidth: 1 - BKRAML: - description: Backup RAM Double error lockup bit - bitOffset: 7 - bitWidth: 1 - SRAM4L: - description: SRAM4 Double error lockup bit - bitOffset: 9 - bitWidth: 1 - SRAM2L: - description: SRAM2 Double error lockup bit - bitOffset: 11 - bitWidth: 1 - SRAM1L: - description: SRAM1 Double error lockup bit - bitOffset: 12 - bitWidth: 1 - DTCML: - description: DTCM-RAM Double error lockup bit - bitOffset: 13 - bitWidth: 1 - ITCML: - description: ITCM-RAM Double error lockup bit - bitOffset: 14 - bitWidth: 1 - AXIRAML: - description: AXISRAM Double error lockup bit - bitOffset: 15 - bitWidth: 1 - ADC2ALT: - description: ADC2 internal input alternate connection - addressOffset: 0x30 - resetValue: 0x00000000 - fields: - ADC2_ROUT1: - description: ADC2 V_INP17 alternate connection - bitOffset: 1 - bitWidth: 1 - ADC2_ROUT0: - description: ADC2 V_INP16 alternate connection - bitOffset: 0 - bitWidth: 1 - UR18: - description: SYSCFG user register 18 - addressOffset: 0x348 - access: read-only - fields: - CPU_FREQ_BOOST: - description: CPU maximum frequency boost - bitOffset: 0 - bitWidth: 1 - _delete: - - UR8 # Only one flash bank - - UR9 - - UR10 - PMCR: - _add: - BOOSTVDDSEL: - description: Analog switch supply voltage selection - bitWidth: 1 - bitOffset: 9 - I2C5FMP: - description: I2C5 Fm+ - bitWidth: 1 - bitOffset: 10 - UR0: - _delete: - - BKS - UR11: - _delete: - - SA_END_2 - UR17: - _add: - TCM_AXI_SHARED_CFG: - description: ITCM-RAM/AXI-SRAM size - bitOffset: 16 - bitWidth: 2 + _include: + - patches/syscfg/h73x.yaml TIM1: _modify: @@ -518,6 +434,8 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: _include: - patches/wwdg/h7.yaml @@ -526,7 +444,6 @@ WWDG1: # ----------------------------------------------------------------------------- _include: - - patches/h7_common_singlecore_735.yaml - patches/ethernet/h7_combined_desc.yaml - collect/usb_otg/hs.yaml - patches/gpio/h7_jk.yaml diff --git a/devices/stm32h733.yaml b/devices/stm32h733.yaml index 306334685..267e6bb28 100644 --- a/devices/stm32h733.yaml +++ b/devices/stm32h733.yaml @@ -29,8 +29,11 @@ _modify: offset: 0x0 size: 0x100 usage: registers + Flash: + name: FLASH + groupName: FLASH -ADC*_Common: +ADC12_Common,ADC3_Common: _strip: ADC_ #_include: fields/adc/adc_v3_common_h7.yaml CCR: @@ -56,6 +59,7 @@ ADC1: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -65,10 +69,14 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: _include: - fields/hdmi_cec.yaml +COMP1: {} + CORDIC: _strip: CORDIC_ _include: @@ -82,6 +90,8 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + # Merge the hundreds of individual bit fields into single fields for the # crypt key/iv registers. CRYP: @@ -90,23 +100,50 @@ CRYP: "IV[01][LR]R": _merge: IV* +DAC: {} + +# Modify the DBGMCU.CR register fields names to be consistent with RM0468. +# TODO: Interesting aside: the svd lists these controls additionally for D2 and +# D3, while the RM0468 specifies those as reserved bits, while still having +# clock controls specified for D2, D3. Thus, it may not be unthinkable that +# the same name changes need to be done for D2, D3, even though the reference +# manual does not specify them. OR: perhaps remove the D2, D3 fields instead? +DBGMCU: + CR: + _modify: + DBGSTBD1: + name: DBGSTBY_D1 + DBGSTPD1: + name: DBGSTOP_D1 + DBGSLPD1: + name: DBGSLEEP_D1 + +DCMI: + _modify: + _interrupts: + DCMI: + name: DCMI_PSSI + description: DCMI/PSSI global interrupt + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX_ _include: @@ -122,38 +159,29 @@ DMAMUX2: - fields/dma/dmamux2_v1.yaml - collect/dma/h7_dmamux.yaml -# Modify the DBGMCU.CR register fields names to be consistent with RM0468. -# TODO: Interesting aside: the svd lists these controls additionally for D2 and -# D3, while the RM0468 specifies those as reserved bits, while still having -# clock controls specified for D2, D3. Thus, it may not be unthinkable that -# the same name changes need to be done for D2, D3, even though the reference -# manual does not specify them. OR: perhaps remove the D2, D3 fields instead? -DBGMCU: - CR: - _modify: - DBGSTBD1: - name: DBGSTBY_D1 - DBGSTPD1: - name: DBGSTOP_D1 - DBGSLPD1: - name: DBGSLEEP_D1 +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml -DCMI: - _modify: - _interrupts: - DCMI: - name: DCMI_PSSI - description: DCMI/PSSI global interrupt +Ethernet_DMA: {} + +Ethernet_MTL: {} EXTI: _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml +FLASH: + _modify: + OPTKEYR: + access: write-only + FMAC: _strip: FMAC_ @@ -164,7 +192,7 @@ FMC: GPIOA: _strip: GPIOA_ -GPIO?: +GPIO[ABCJK]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -176,10 +204,11 @@ GPIO[BCJK]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml @@ -189,7 +218,7 @@ IWDG1: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +LPTIM[13]: _include: - fields/lptim/lptim_v1.yaml @@ -212,22 +241,30 @@ MDIOS: _strip: MDIOS_ MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml # OCTOSPI blocks -OCTOSPI?: +OCTOSPI1: AR: _modify: ADRESS: name: ADDRESS +OctoSPII_O_Manager: {} + +OPAMP: {} + OTFDEC1: _strip: OTFDEC_ -OTG?_HS_*: +OTG1_HS_*: _strip: OTG_HS_ +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_GLOBAL: _include: patches/usb_otg/hsglobal.yaml _add: @@ -248,52 +285,18 @@ OTG1_HS_GLOBAL: OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} PSSI: _strip: PSSI_ # PWR block PWR: - CR3: - _add: - SDEXTHP: - description: SMPS step-down converter forced ON and in High Power MR mode - bitWidth: 1 - bitOffset: 3 - SDLEVEL: - description: SMPS step-down converter voltage output level selection - bitWidth: 2 - bitOffset: 4 - SDEXTRDY: - description: SMPS step-down converter external supply ready - bitWidth: 1 - bitOffset: 16 - WKUPCR: - _delete: - - WKUPC - _add: - WKUPC1: - description: Clear Wakeup pin flag for WKUPC1 - bitWidth: 1 - bitOffset: 0 - WKUPC2: - description: Clear Wakeup pin flag for WKUPC2 - bitWidth: 1 - bitOffset: 1 - WKUPC4: - description: Clear Wakeup pin flag for WKUPC4 - bitWidth: 1 - bitOffset: 3 - WKUPC6: - description: Clear Wakeup pin flag for WKUPC6 - bitWidth: 1 - bitOffset: 5 - WKUPFR: - _delete: - - WKUPF3 - - WKUPF5 + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/wkupc1246.yaml + +RAMECC[123]: {} # RCC block RCC: @@ -321,6 +324,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -328,7 +332,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -337,10 +341,12 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SDMMC?: +SDMMC1: _strip: SDMMC_ -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -348,102 +354,12 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + # SYSCFG block SYSCFG: - _add: - CFGR: - description: Timer break lockup register - addressOffset: 0x18 - resetValue: 0x00000000 - fields: - PVDL: - description: Programmable voltage detector lockup bit - bitOffset: 2 - bitWidth: 1 - FLASHL: - description: FLASH double error lockup bit - bitOffset: 3 - bitWidth: 1 - CM7L: - description: CPU lockup bit - bitOffset: 6 - bitWidth: 1 - BKRAML: - description: Backup RAM Double error lockup bit - bitOffset: 7 - bitWidth: 1 - SRAM4L: - description: SRAM4 Double error lockup bit - bitOffset: 9 - bitWidth: 1 - SRAM2L: - description: SRAM2 Double error lockup bit - bitOffset: 11 - bitWidth: 1 - SRAM1L: - description: SRAM1 Double error lockup bit - bitOffset: 12 - bitWidth: 1 - DTCML: - description: DTCM-RAM Double error lockup bit - bitOffset: 13 - bitWidth: 1 - ITCML: - description: ITCM-RAM Double error lockup bit - bitOffset: 14 - bitWidth: 1 - AXIRAML: - description: AXISRAM Double error lockup bit - bitOffset: 15 - bitWidth: 1 - ADC2ALT: - description: ADC2 internal input alternate connection - addressOffset: 0x30 - resetValue: 0x00000000 - fields: - ADC2_ROUT1: - description: ADC2 V_INP17 alternate connection - bitOffset: 1 - bitWidth: 1 - ADC2_ROUT0: - description: ADC2 V_INP16 alternate connection - bitOffset: 0 - bitWidth: 1 - UR18: - description: SYSCFG user register 18 - addressOffset: 0x348 - access: read-only - fields: - CPU_FREQ_BOOST: - description: CPU maximum frequency boost - bitOffset: 0 - bitWidth: 1 - _delete: - - UR8 # Only one flash bank - - UR9 - - UR10 - PMCR: - _add: - BOOSTVDDSEL: - description: Analog switch supply voltage selection - bitWidth: 1 - bitOffset: 9 - I2C5FMP: - description: I2C5 Fm+ - bitWidth: 1 - bitOffset: 10 - UR0: - _delete: - - BKS - UR11: - _delete: - - SA_END_2 - UR17: - _add: - TCM_AXI_SHARED_CFG: - description: ITCM-RAM/AXI-SRAM size - bitOffset: 16 - bitWidth: 2 + _include: + - patches/syscfg/h73x.yaml TIM1: _modify: @@ -518,6 +434,8 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: _include: - patches/wwdg/h7.yaml @@ -526,7 +444,6 @@ WWDG1: # ----------------------------------------------------------------------------- _include: - - patches/h7_common_singlecore_735.yaml - patches/ethernet/h7_combined_desc.yaml - collect/usb_otg/hs.yaml - patches/gpio/h7_jk.yaml diff --git a/devices/stm32h735.yaml b/devices/stm32h735.yaml index 8f84b2fa8..50371f14d 100644 --- a/devices/stm32h735.yaml +++ b/devices/stm32h735.yaml @@ -29,8 +29,11 @@ _modify: offset: 0x0 size: 0x100 usage: registers + Flash: + name: FLASH + groupName: FLASH -ADC*_Common: +ADC12_Common,ADC3_Common: _strip: ADC_ #_include: fields/adc/adc_v3_common_h7.yaml CCR: @@ -56,6 +59,7 @@ ADC1: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -65,10 +69,14 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: _include: - fields/hdmi_cec.yaml +COMP1: {} + CORDIC: _strip: CORDIC_ _include: @@ -82,6 +90,8 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + # Merge the hundreds of individual bit fields into single fields for the # crypt key/iv registers. CRYP: @@ -90,18 +100,48 @@ CRYP: "IV[01][LR]R": _merge: IV* -DMA2D: +DAC: {} + +# Modify the DBGMCU.CR register fields names to be consistent with RM0468. +# TODO: Interesting aside: the svd lists these controls additionally for D2 and +# D3, while the RM0468 specifies those as reserved bits, while still having +# clock controls specified for D2, D3. Thus, it may not be unthinkable that +# the same name changes need to be done for D2, D3, even though the reference +# manual does not specify them. OR: perhaps remove the D2, D3 fields instead? +DBGMCU: + CR: + _modify: + DBGSTBD1: + name: DBGSTBY_D1 + DBGSTPD1: + name: DBGSTOP_D1 + DBGSLPD1: + name: DBGSLEEP_D1 + +DCMI: + _modify: + _interrupts: + DCMI: + name: DCMI_PSSI + description: DCMI/PSSI global interrupt + +DFSDM: _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml + - patches/dfsdm/h735_747_753.yaml + - collect/dfsdm/v1.yaml -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX_ _include: @@ -117,43 +157,29 @@ DMAMUX2: - fields/dma/dmamux2_v1.yaml - collect/dma/h7_dmamux.yaml -# Modify the DBGMCU.CR register fields names to be consistent with RM0468. -# TODO: Interesting aside: the svd lists these controls additionally for D2 and -# D3, while the RM0468 specifies those as reserved bits, while still having -# clock controls specified for D2, D3. Thus, it may not be unthinkable that -# the same name changes need to be done for D2, D3, even though the reference -# manual does not specify them. OR: perhaps remove the D2, D3 fields instead? -DBGMCU: - CR: - _modify: - DBGSTBD1: - name: DBGSTBY_D1 - DBGSTPD1: - name: DBGSTOP_D1 - DBGSLPD1: - name: DBGSLEEP_D1 - -DFSDM: +Ethernet_MAC: _include: - - patches/dfsdm/h735_747_753.yaml - - collect/dfsdm/v1.yaml + - patches/ethernet/mac_lpiet_3.yaml -DCMI: - _modify: - _interrupts: - DCMI: - name: DCMI_PSSI - description: DCMI/PSSI global interrupt +Ethernet_DMA: {} + +Ethernet_MTL: {} EXTI: _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml +FLASH: + _modify: + OPTKEYR: + access: write-only + FMAC: _strip: FMAC_ @@ -164,7 +190,7 @@ FMC: GPIOA: _strip: GPIOA_ -GPIO?: +GPIO[ABCJK]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -176,10 +202,11 @@ GPIO[BCJK]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml @@ -189,7 +216,7 @@ IWDG1: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +LPTIM[13]: _include: - fields/lptim/lptim_v1.yaml @@ -212,20 +239,25 @@ MDIOS: _strip: MDIOS_ MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml # OCTOSPI blocks -OCTOSPI?: +OCTOSPI1: AR: _modify: ADRESS: name: ADDRESS +OctoSPII_O_Manager: {} + +OPAMP: {} + OTFDEC1: _strip: OTFDEC_ -OTG?_HS_*: +OTG1_HS_*: _strip: OTG_HS_ OTG1_HS_GLOBAL: @@ -245,55 +277,24 @@ OTG1_HS_GLOBAL: value: 77 description: USB OTG_HS global interrupt +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} PSSI: _strip: PSSI_ # PWR block PWR: - CR3: - _add: - SDEXTHP: - description: SMPS step-down converter forced ON and in High Power MR mode - bitWidth: 1 - bitOffset: 3 - SDLEVEL: - description: SMPS step-down converter voltage output level selection - bitWidth: 2 - bitOffset: 4 - SDEXTRDY: - description: SMPS step-down converter external supply ready - bitWidth: 1 - bitOffset: 16 - WKUPCR: - _delete: - - WKUPC - _add: - WKUPC1: - description: Clear Wakeup pin flag for WKUPC1 - bitWidth: 1 - bitOffset: 0 - WKUPC2: - description: Clear Wakeup pin flag for WKUPC2 - bitWidth: 1 - bitOffset: 1 - WKUPC4: - description: Clear Wakeup pin flag for WKUPC4 - bitWidth: 1 - bitOffset: 3 - WKUPC6: - description: Clear Wakeup pin flag for WKUPC6 - bitWidth: 1 - bitOffset: 5 - WKUPFR: - _delete: - - WKUPF3 - - WKUPF5 + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/wkupc1246.yaml + +RAMECC[123]: {} # RCC block RCC: @@ -321,6 +322,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -328,7 +330,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI1: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -337,10 +339,12 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SDMMC?: +SDMMC1: _strip: SDMMC_ -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -348,102 +352,12 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + # SYSCFG block SYSCFG: - _add: - CFGR: - description: Timer break lockup register - addressOffset: 0x18 - resetValue: 0x00000000 - fields: - PVDL: - description: Programmable voltage detector lockup bit - bitOffset: 2 - bitWidth: 1 - FLASHL: - description: FLASH double error lockup bit - bitOffset: 3 - bitWidth: 1 - CM7L: - description: CPU lockup bit - bitOffset: 6 - bitWidth: 1 - BKRAML: - description: Backup RAM Double error lockup bit - bitOffset: 7 - bitWidth: 1 - SRAM4L: - description: SRAM4 Double error lockup bit - bitOffset: 9 - bitWidth: 1 - SRAM2L: - description: SRAM2 Double error lockup bit - bitOffset: 11 - bitWidth: 1 - SRAM1L: - description: SRAM1 Double error lockup bit - bitOffset: 12 - bitWidth: 1 - DTCML: - description: DTCM-RAM Double error lockup bit - bitOffset: 13 - bitWidth: 1 - ITCML: - description: ITCM-RAM Double error lockup bit - bitOffset: 14 - bitWidth: 1 - AXIRAML: - description: AXISRAM Double error lockup bit - bitOffset: 15 - bitWidth: 1 - ADC2ALT: - description: ADC2 internal input alternate connection - addressOffset: 0x30 - resetValue: 0x00000000 - fields: - ADC2_ROUT1: - description: ADC2 V_INP17 alternate connection - bitOffset: 1 - bitWidth: 1 - ADC2_ROUT0: - description: ADC2 V_INP16 alternate connection - bitOffset: 0 - bitWidth: 1 - UR18: - description: SYSCFG user register 18 - addressOffset: 0x348 - access: read-only - fields: - CPU_FREQ_BOOST: - description: CPU maximum frequency boost - bitOffset: 0 - bitWidth: 1 - _delete: - - UR8 # Only one flash bank - - UR9 - - UR10 - PMCR: - _add: - BOOSTVDDSEL: - description: Analog switch supply voltage selection - bitWidth: 1 - bitOffset: 9 - I2C5FMP: - description: I2C5 Fm+ - bitWidth: 1 - bitOffset: 10 - UR0: - _delete: - - BKS - UR11: - _delete: - - SA_END_2 - UR17: - _add: - TCM_AXI_SHARED_CFG: - description: ITCM-RAM/AXI-SRAM size - bitOffset: 16 - bitWidth: 2 + _include: + - patches/syscfg/h73x.yaml TIM1: _modify: @@ -518,6 +432,8 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: _include: - patches/wwdg/h7.yaml @@ -525,7 +441,6 @@ WWDG1: # ----------------------------------------------------------------------------- _include: - - patches/h7_common_singlecore_735.yaml - patches/ethernet/h7_combined_desc.yaml - collect/usb_otg/hs.yaml - patches/gpio/h7_jk.yaml diff --git a/devices/stm32h742.yaml b/devices/stm32h742.yaml index 12fdbf289..2943a378c 100644 --- a/devices/stm32h742.yaml +++ b/devices/stm32h742.yaml @@ -5,6 +5,9 @@ _clear_fields: "*" _modify: COMP1: groupName: COMP + Flash: + name: FLASH + groupName: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -19,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -35,6 +38,7 @@ ADC3: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -44,10 +48,14 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -56,23 +64,33 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + +DAC: {} + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX_ _include: @@ -88,16 +106,35 @@ DMAMUX2: - fields/dma/dmamux2_v1.yaml - collect/dma/h7_dmamux.yaml +Ethernet_DMA: {} + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml FLASH: + _modify: + PRAR_PRG2: + addressOffset: 0x12C + alternateRegister: "" + KEYR[12]: + access: write-only + OPTKEYR: + access: write-only + BOOT_PRGR: + access: read-write CR1: _add: # CR2 only. Needed for clusterization @@ -120,7 +157,7 @@ FMC: GPIOA: _strip: GPIOA_ -GPIO?: +GPIO[ABC]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -132,10 +169,11 @@ GPIO[BC]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml @@ -145,7 +183,9 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: {} + +LPTIM[13]: _include: - fields/lptim/lptim_v1.yaml @@ -159,27 +199,40 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: {} + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml -OTG?_HS_*: +OPAMP: {} + +OTG1_HS_*: _strip: OTG_HS_ +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_GLOBAL: _include: patches/usb_otg/hsglobal.yaml OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} + +PWR: {} QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml +RAMECC[123]: + _include: + - patches/ramecc/ramecc.yaml + RCC: _include: - patches/rcc/h7_common_singlecore.yaml @@ -194,6 +247,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -201,7 +255,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI4: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -209,7 +263,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -217,6 +275,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -302,19 +362,19 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG: _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_singlecore.yaml - patches/ethernet/h7_desc.yaml - patches/dbgmcu/h7.yaml - patches/ethernet/h7_dma_mr.yaml - patches/h7_spdifrx.yaml - collect/usb_otg/hs.yaml - - patches/ramecc/ramecc.yaml - patches/gpio/h7_ijk.yaml - patches/hrtim/h7.yaml - fields/hrtim/hrtim.yaml diff --git a/devices/stm32h743.yaml b/devices/stm32h743.yaml index a46ddf09a..616040e58 100644 --- a/devices/stm32h743.yaml +++ b/devices/stm32h743.yaml @@ -5,6 +5,9 @@ _clear_fields: "*" _modify: COMP1: groupName: COMP + Flash: + name: FLASH + groupName: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -19,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -35,6 +38,7 @@ ADC3: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -44,10 +48,14 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -56,23 +64,33 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + +DAC: {} + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h743.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX_ _include: @@ -88,16 +106,35 @@ DMAMUX2: - fields/dma/dmamux2_v1.yaml - collect/dma/h7_dmamux.yaml +Ethernet_DMA: {} + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml FLASH: + _modify: + PRAR_PRG2: + addressOffset: 0x12C + alternateRegister: "" + KEYR[12]: + access: write-only + OPTKEYR: + access: write-only + BOOT_PRGR: + access: read-write CR1: _add: # CR2 only. Needed for clusterization @@ -120,7 +157,7 @@ FMC: GPIOA: _strip: GPIOA_ -GPIO?: +GPIO[ABC]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -132,10 +169,11 @@ GPIO[BC]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml @@ -145,7 +183,9 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: {} + +LPTIM[13]: _include: - fields/lptim/lptim_v1.yaml @@ -159,27 +199,40 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: {} + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml -OTG?_HS_*: +OPAMP: {} + +OTG1_HS_*: _strip: OTG_HS_ +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_GLOBAL: _include: patches/usb_otg/hsglobal.yaml OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} + +PWR: {} QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml +RAMECC[123]: + _include: + - patches/ramecc/ramecc.yaml + RCC: _include: - patches/rcc/h7_common_singlecore.yaml @@ -194,6 +247,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -201,7 +255,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI4: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -209,7 +263,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -217,6 +275,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -306,19 +366,19 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG: _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_singlecore.yaml - patches/ethernet/h7_desc.yaml - patches/dbgmcu/h7.yaml - patches/ethernet/h7_dma_mr.yaml - patches/h7_spdifrx.yaml - collect/usb_otg/hs.yaml - - patches/ramecc/ramecc.yaml - patches/gpio/h7_ijk.yaml - patches/hrtim/h7.yaml - fields/hrtim/hrtim.yaml diff --git a/devices/stm32h743v.yaml b/devices/stm32h743v.yaml index 3f64befe3..aa7cafc3c 100644 --- a/devices/stm32h743v.yaml +++ b/devices/stm32h743v.yaml @@ -5,6 +5,9 @@ _clear_fields: "*" _modify: COMP1: groupName: COMP + Flash: + name: FLASH + groupName: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -19,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -36,6 +39,7 @@ ADC3: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -45,10 +49,14 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -57,23 +65,33 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + +DAC: {} + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h743.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX_ _include: @@ -89,16 +107,35 @@ DMAMUX2: - fields/dma/dmamux2_v1.yaml - collect/dma/h7_dmamux.yaml +Ethernet_DMA: {} + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml FLASH: + _modify: + PRAR_PRG2: + addressOffset: 0x12C + alternateRegister: "" + KEYR[12]: + access: write-only + OPTKEYR: + access: write-only + BOOT_PRGR: + access: read-write CR1: _add: # CR2 only. Needed for clusterization @@ -121,7 +158,7 @@ FMC: GPIOA: _strip: GPIOA_ -GPIO?: +GPIO[ABC]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -133,10 +170,11 @@ GPIO[BC]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml @@ -146,7 +184,9 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: {} + +LPTIM[13]: _include: - fields/lptim/lptim_v1.yaml @@ -160,27 +200,40 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: {} + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml -OTG?_HS_*: +OPAMP: {} + +OTG1_HS_*: _strip: OTG_HS_ +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_GLOBAL: _include: patches/usb_otg/hsglobal.yaml OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} + +PWR: {} QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml +RAMECC[123]: + _include: + - patches/ramecc/ramecc.yaml + RCC: _include: - patches/rcc/h7_common_singlecore.yaml @@ -196,6 +249,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -203,7 +257,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI4: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -211,7 +265,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -219,6 +277,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -308,19 +368,19 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG: _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_singlecore.yaml - patches/ethernet/h7_dma_mr.yaml - patches/ethernet/h7_desc.yaml - patches/dbgmcu/h7.yaml - patches/h7_spdifrx.yaml - collect/usb_otg/hs.yaml - - patches/ramecc/ramecc.yaml - patches/gpio/h7_ijk.yaml - patches/hrtim/h7.yaml - fields/hrtim/hrtim.yaml diff --git a/devices/stm32h745cm4.yaml b/devices/stm32h745cm4.yaml index 5fafa28dd..a137249c0 100644 --- a/devices/stm32h745cm4.yaml +++ b/devices/stm32h745cm4.yaml @@ -1,8 +1,13 @@ _svd: ../svd/stm32h745cm4.svd +_delete: + - RAMECC? # RAMECC definitions are so terrible + _modify: COMP1: groupName: COMP + Flash: + name: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -17,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -33,16 +38,26 @@ ADC3: SQR?: SQ*: [0, 19] +ART: {} + +AXI: + _strip: AXI_ + BDMA: _include: - patches/dma/bdma.yaml - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -51,23 +66,36 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + +DAC: + _strip: DAC_ + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -90,12 +118,27 @@ DSIHOST: - patches/dsi/h7-desc.yaml - collect/dsi/isr.yaml +Ethernet_DMA: + DMASBMR: + _modify: + RB: + access: read-write + MB: + access: read-write + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_dualcore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -105,10 +148,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO_ _include: - patches/gpio/add_r_suffix.yaml @@ -121,21 +165,32 @@ GPIO[BC]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - patches/hsem/h7_dual.yaml - patches/hsem/h7_dual_cm4.yaml - collect/hsem/r.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG1: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ + _include: + - fields/lptim/lptim_v1.yaml + LPUART1: _include: - fields/usart/v4/lp_wl.yaml @@ -146,23 +201,37 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml +OPAMP: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + +PWR: + _strip: PWR_ + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/h7_dual.yaml + QUADSPI: _strip: QUADSPI_ _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -LPTIM?: - _include: - - fields/lptim/lptim_v1.yaml - -PWR: - _include: - - patches/pwr/h7_dual.yaml +RAMECC[13]: {} RCC: _delete: @@ -189,11 +258,13 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - collect/rtc/alarm.yaml @@ -201,8 +272,6 @@ RTC: SAI4: _strip: SAI_ - -SAI?: _include: - patches/sai/h7.yaml - patches/sai/h7_mcken.yaml @@ -210,7 +279,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -218,6 +291,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -293,13 +368,16 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_dualcore.yaml + - patches/h743_hrtim_common.yaml - patches/ethernet/h7_combined_desc.yaml - patches/flash/h7_dualcore.yaml - patches/h7_spdifrx.yaml diff --git a/devices/stm32h745cm7.yaml b/devices/stm32h745cm7.yaml index 425b04b7d..b29ed9149 100644 --- a/devices/stm32h745cm7.yaml +++ b/devices/stm32h745cm7.yaml @@ -1,8 +1,13 @@ _svd: ../svd/stm32h745cm7.svd +_delete: + - RAMECC? # RAMECC definitions are so terrible + _modify: COMP1: groupName: COMP + Flash: + name: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -17,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -33,7 +38,10 @@ ADC3: SQR?: SQ*: [0, 19] +ART: {} + AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -43,10 +51,15 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -55,23 +68,34 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + +DAC: + _strip: DAC_ + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -94,12 +118,27 @@ DSIHOST: - patches/dsi/h7-desc.yaml - collect/dsi/isr.yaml +Ethernet_DMA: + DMASBMR: + _modify: + RB: + access: read-write + MB: + access: read-write + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_dualcore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -109,10 +148,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO_ _include: - patches/gpio/add_r_suffix.yaml @@ -125,21 +165,28 @@ GPIO[BC]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - patches/hsem/h7_dual.yaml - collect/hsem/r.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG1: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -153,19 +200,37 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml +OPAMP: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + +PWR: + _strip: PWR_ + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/h7_dual.yaml + QUADSPI: _strip: QUADSPI_ _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _include: - - patches/pwr/h7_dual.yaml +RAMECC[13]: {} RCC: _delete: @@ -192,11 +257,13 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -206,8 +273,6 @@ RTC: SAI4: _strip: SAI_ - -SAI?: _include: - patches/sai/h7.yaml - patches/sai/h7_mcken.yaml @@ -215,7 +280,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -223,6 +292,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -298,13 +369,16 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_dualcore.yaml + - patches/h743_hrtim_common.yaml - patches/ethernet/h7_combined_desc.yaml - patches/flash/h7_dualcore.yaml - patches/h7_spdifrx.yaml diff --git a/devices/stm32h747cm4.yaml b/devices/stm32h747cm4.yaml index 983251d86..6b01dbc08 100644 --- a/devices/stm32h747cm4.yaml +++ b/devices/stm32h747cm4.yaml @@ -1,8 +1,13 @@ _svd: ../svd/stm32h747cm4.svd +_delete: + - RAMECC? # RAMECC definitions are so terrible + _modify: COMP1: groupName: COMP + Flash: + name: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -17,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -33,16 +38,26 @@ ADC3: SQR?: SQ*: [0, 19] +ART: {} + +AXI: + _strip: AXI_ + BDMA: _include: - patches/dma/bdma.yaml - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -51,23 +66,34 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + +DAC: + _strip: DAC_ + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -90,12 +116,27 @@ DSIHOST: - patches/dsi/h7-desc.yaml - collect/dsi/isr.yaml +Ethernet_DMA: + DMASBMR: + _modify: + RB: + access: read-write + MB: + access: read-write + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_dualcore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -105,10 +146,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO_ _include: - patches/gpio/add_r_suffix.yaml @@ -121,22 +163,29 @@ GPIO[BC]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - patches/hsem/h7_dual.yaml - patches/hsem/h7_dual_cm4.yaml - collect/hsem/r.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG1: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -150,19 +199,37 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml +OPAMP: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + +PWR: + _strip: PWR_ + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/h7_dual.yaml + QUADSPI: _strip: QUADSPI_ _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _include: - - patches/pwr/h7_dual.yaml +RAMECC[13]: {} RCC: _delete: @@ -189,11 +256,13 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - collect/rtc/alarm.yaml @@ -201,8 +270,6 @@ RTC: SAI4: _strip: SAI_ - -SAI?: _include: - patches/sai/h7.yaml - patches/sai/h7_mcken.yaml @@ -210,7 +277,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -218,6 +289,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -293,13 +366,16 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_dualcore.yaml + - patches/h743_hrtim_common.yaml - patches/ethernet/h7_combined_desc.yaml - patches/flash/h7_dualcore.yaml - patches/h7_spdifrx.yaml diff --git a/devices/stm32h747cm7.yaml b/devices/stm32h747cm7.yaml index 69154aa51..8c58fdb48 100644 --- a/devices/stm32h747cm7.yaml +++ b/devices/stm32h747cm7.yaml @@ -1,8 +1,13 @@ _svd: ../svd/stm32h747cm7.svd +_delete: + - RAMECC? # RAMECC definitions are so terrible + _modify: COMP1: groupName: COMP + Flash: + name: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -17,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -33,7 +38,10 @@ ADC3: SQR?: SQ*: [0, 19] +ART: {} + AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -43,10 +51,15 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -55,23 +68,36 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + +DAC: + _strip: DAC_ + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -94,12 +120,27 @@ DSIHOST: - patches/dsi/h7-desc.yaml - collect/dsi/isr.yaml +Ethernet_DMA: + DMASBMR: + _modify: + RB: + access: read-write + MB: + access: read-write + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_dualcore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -109,10 +150,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO_ _include: - patches/gpio/add_r_suffix.yaml @@ -125,21 +167,28 @@ GPIO[BC]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - patches/hsem/h7_dual.yaml - collect/hsem/r.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG1: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -153,19 +202,37 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml +OPAMP: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + +PWR: + _strip: PWR_ + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/h7_dual.yaml + QUADSPI: _strip: QUADSPI_ _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _include: - - patches/pwr/h7_dual.yaml +RAMECC[13]: {} RCC: _delete: @@ -192,11 +259,13 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -206,8 +275,6 @@ RTC: SAI4: _strip: SAI_ - -SAI?: _include: - patches/sai/h7.yaml - patches/sai/h7_mcken.yaml @@ -215,7 +282,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -223,6 +294,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -298,13 +371,16 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_dualcore.yaml + - patches/h743_hrtim_common.yaml - patches/ethernet/h7_combined_desc.yaml - patches/flash/h7_dualcore.yaml - patches/h7_spdifrx.yaml diff --git a/devices/stm32h750.yaml b/devices/stm32h750.yaml index 68df7928c..161ba5a98 100644 --- a/devices/stm32h750.yaml +++ b/devices/stm32h750.yaml @@ -5,6 +5,9 @@ _clear_fields: "*" _modify: COMP1: groupName: COMP + Flash: + name: FLASH + groupName: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -19,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -34,6 +37,7 @@ ADC3: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -43,11 +47,15 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: _strip: CEC_ _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -59,27 +67,35 @@ CRC: CRS: _strip: CRS_ +CRYP: {} + DAC: _strip: DAC_ +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _strip: DMA2D_ - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX_ _include: @@ -103,11 +119,22 @@ EXTI: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml FLASH: + _modify: + PRAR_PRG2: + addressOffset: 0x12C + alternateRegister: "" + KEYR[12]: + access: write-only + OPTKEYR: + access: write-only + BOOT_PRGR: + access: read-write CR1: _add: # CR2 only. Needed for clusterization @@ -128,7 +155,7 @@ FMC: _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO_ _include: - patches/gpio/add_r_suffix.yaml @@ -140,15 +167,16 @@ GPIO[A]: GPIO[BC]: _include: collect/gpio/v2_derive.yaml -HSEM: - _include: - - collect/hsem/r.yaml - HASH: _include: - collect/hash/v2.yaml -I2C?: +HSEM: + _strip: HSEM_ + _include: + - collect/hsem/r.yaml + +I2C1: _strip: I2C_ _include: - patches/i2c/merge_CR2_SADDx_fields.yaml @@ -163,7 +191,7 @@ IWDG: JPEG: _strip: JPEG_ -LPTIM?: +LPTIM[13]: _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -182,20 +210,25 @@ MDIOS: _strip: MDIOS_ MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml +OPAMP: {} + OTG?_HS_*: _strip: OTG_HS_ +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_GLOBAL: _include: patches/usb_otg/hsglobal.yaml OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} PWR: _strip: PWR_ @@ -206,6 +239,10 @@ QUADSPI: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml +RAMECC[123]: + _include: + - patches/ramecc/ramecc.yaml + RCC: _include: - patches/rcc/h7_common_singlecore.yaml @@ -221,6 +258,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -228,7 +266,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI4: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -239,7 +277,9 @@ SAI?: SDMMC1: _strip: SDMMC_ -SPI?: +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -247,6 +287,10 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + +SYSCFG: {} + TIM1: _include: - patches/tim/icpsc.yaml @@ -326,11 +370,9 @@ WWDG: - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_singlecore.yaml - patches/dbgmcu/h7.yaml - patches/h7_spdifrx.yaml - collect/usb_otg/hs.yaml - - patches/ramecc/ramecc.yaml - patches/gpio/h7_ijk.yaml - patches/hrtim/h7.yaml - fields/hrtim/hrtim.yaml diff --git a/devices/stm32h753.yaml b/devices/stm32h753.yaml index 44f5ba227..5c77ebd9e 100644 --- a/devices/stm32h753.yaml +++ b/devices/stm32h753.yaml @@ -5,6 +5,9 @@ _clear_fields: "*" _modify: COMP1: groupName: COMP + Flash: + name: FLASH + groupName: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -19,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -35,6 +38,7 @@ ADC3: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -44,10 +48,14 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -56,6 +64,8 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + # Merge the hundreds of individual bit fields into single fields for the # crypt key/iv registers. CRYP: @@ -64,23 +74,31 @@ CRYP: "IV[01][LR]R": _merge: IV* +DAC: {} + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX_ _include: @@ -96,16 +114,35 @@ DMAMUX2: - fields/dma/dmamux2_v1.yaml - collect/dma/h7_dmamux.yaml +Ethernet_DMA: {} + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml FLASH: + _modify: + PRAR_PRG2: + addressOffset: 0x12C + alternateRegister: "" + KEYR[12]: + access: write-only + OPTKEYR: + access: write-only + BOOT_PRGR: + access: read-write CR1: _add: # CR2 only. Needed for clusterization @@ -128,7 +165,7 @@ FMC: GPIOA: _strip: GPIOA_ -GPIO?: +GPIO[ABC]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -144,10 +181,11 @@ HASH: - collect/hash/v2.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml @@ -157,7 +195,9 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: {} + +LPTIM[13]: _include: - fields/lptim/lptim_v1.yaml @@ -171,27 +211,40 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: {} + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml -OTG?_HS_*: +OPAMP: {} + +OTG1_HS_*: _strip: OTG_HS_ +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_GLOBAL: _include: patches/usb_otg/hsglobal.yaml OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} + +PWR: {} QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml +RAMECC[123]: + _include: + - patches/ramecc/ramecc.yaml + RCC: _include: - patches/rcc/h7_common_singlecore.yaml @@ -206,6 +259,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -213,7 +267,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI4: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -221,7 +275,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -229,6 +287,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -318,19 +378,19 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG: _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_singlecore.yaml - patches/ethernet/h7_dma_mr.yaml - patches/ethernet/h7_desc.yaml - patches/dbgmcu/h7.yaml - patches/h7_spdifrx.yaml - collect/usb_otg/hs.yaml - - patches/ramecc/ramecc.yaml - patches/gpio/h7_ijk.yaml - patches/hrtim/h7.yaml - fields/hrtim/hrtim.yaml diff --git a/devices/stm32h753v.yaml b/devices/stm32h753v.yaml index a74663416..8a44fc022 100644 --- a/devices/stm32h753v.yaml +++ b/devices/stm32h753v.yaml @@ -5,6 +5,9 @@ _clear_fields: "*" _modify: COMP1: groupName: COMP + Flash: + name: FLASH + groupName: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -19,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -36,6 +39,7 @@ ADC3: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -45,10 +49,14 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -57,6 +65,8 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: {} + # Merge the hundreds of individual bit fields into single fields for the # crypt key/iv registers. CRYP: @@ -65,23 +75,31 @@ CRYP: "IV[01][LR]R": _merge: IV* +DAC: {} + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX_ _include: @@ -97,16 +115,35 @@ DMAMUX2: - fields/dma/dmamux2_v1.yaml - collect/dma/h7_dmamux.yaml +Ethernet_DMA: {} + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml FLASH: + _modify: + PRAR_PRG2: + addressOffset: 0x12C + alternateRegister: "" + KEYR[12]: + access: write-only + OPTKEYR: + access: write-only + BOOT_PRGR: + access: read-write CR1: _add: # CR2 only. Needed for clusterization @@ -129,7 +166,7 @@ FMC: GPIOA: _strip: GPIOA_ -GPIO?: +GPIO[ABC]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -145,10 +182,11 @@ HASH: - collect/hash/v2.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml @@ -158,7 +196,9 @@ IWDG: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: {} + +LPTIM[13]: _include: - fields/lptim/lptim_v1.yaml @@ -172,27 +212,38 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: {} + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml -OTG?_HS_*: +OPAMP: {} + +OTG1_HS_*: _strip: OTG_HS_ +OTG1_HS_DEVICE: + _include: patches/usb_otg/hsdevice.yaml + OTG1_HS_GLOBAL: _include: patches/usb_otg/hsglobal.yaml OTG1_HS_HOST: _include: patches/usb_otg/hshost_address_12_15.yaml -OTG1_HS_DEVICE: - _include: patches/usb_otg/hsdevice.yaml +OTG1_HS_PWRCLK: {} QUADSPI: _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml +RAMECC[123]: + _include: + - patches/ramecc/ramecc.yaml + RCC: _include: - patches/rcc/h7_common_singlecore.yaml @@ -208,6 +259,7 @@ RNG: - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -215,7 +267,7 @@ RTC: - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -SAI?: +SAI4: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -223,7 +275,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7.yaml @@ -231,6 +287,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -320,19 +378,19 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG: _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_singlecore.yaml - patches/ethernet/h7_dma_mr.yaml - patches/ethernet/h7_desc.yaml - patches/dbgmcu/h7.yaml - patches/h7_spdifrx.yaml - collect/usb_otg/hs.yaml - - patches/ramecc/ramecc.yaml - patches/gpio/h7_ijk.yaml - patches/hrtim/h7.yaml - fields/hrtim/hrtim.yaml diff --git a/devices/stm32h755cm4.yaml b/devices/stm32h755cm4.yaml index e15f2b8e7..6039ec28f 100644 --- a/devices/stm32h755cm4.yaml +++ b/devices/stm32h755cm4.yaml @@ -1,8 +1,13 @@ _svd: ../svd/stm32h755cm4.svd +_delete: + - RAMECC? # RAMECC definitions are so terrible + _modify: COMP1: groupName: COMP + Flash: + name: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -17,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -33,16 +38,26 @@ ADC3: SQR?: SQ*: [0, 19] +ART: {} + +AXI: + _strip: AXI_ + BDMA: _include: - patches/dma/bdma.yaml - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -51,28 +66,41 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + # Applies to the H745/H747/H755/H757 # CRYP and HASH are unavailable on the H745/H747 CRYP: _include: patches/cryp/merge_fields.yaml +DAC: + _strip: DAC_ + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -95,12 +123,27 @@ DSIHOST: - patches/dsi/h7-desc.yaml - collect/dsi/isr.yaml +Ethernet_DMA: + DMASBMR: + _modify: + RB: + access: read-write + MB: + access: read-write + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_dualcore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -110,10 +153,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO_ _include: - patches/gpio/add_r_suffix.yaml @@ -130,22 +174,29 @@ HASH: - collect/hash/v2.yaml HSEM: + _strip: HSEM_ _include: - patches/hsem/h7_dual.yaml - patches/hsem/h7_dual_cm4.yaml - collect/hsem/r.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG1: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -159,16 +210,38 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml +OPAMP: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + +PWR: + _strip: PWR_ + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/h7_dual.yaml + QUADSPI: _strip: QUADSPI_ _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml +RAMECC[13]: {} + RCC: _delete: - ICSCR @@ -194,24 +267,20 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - collect/rtc/alarm.yaml - collect/rtc/bkpr.yaml -PWR: - _include: - - patches/pwr/h7_dual.yaml - SAI4: _strip: SAI_ - -SAI?: _include: - patches/sai/h7.yaml - patches/sai/h7_mcken.yaml @@ -219,7 +288,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -227,6 +300,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -302,13 +377,16 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_dualcore.yaml + - patches/h743_hrtim_common.yaml - patches/ethernet/h7_combined_desc.yaml - patches/flash/h7_dualcore.yaml - patches/h7_spdifrx.yaml diff --git a/devices/stm32h755cm7.yaml b/devices/stm32h755cm7.yaml index 50c14082a..ad4504323 100644 --- a/devices/stm32h755cm7.yaml +++ b/devices/stm32h755cm7.yaml @@ -1,8 +1,13 @@ _svd: ../svd/stm32h755cm7.svd +_delete: + - RAMECC? # RAMECC definitions are so terrible + _modify: COMP1: groupName: COMP + Flash: + name: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -17,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -33,16 +38,26 @@ ADC3: SQR?: SQ*: [0, 19] +ART: {} + +AXI: + _strip: AXI_ + BDMA: _include: - patches/dma/bdma.yaml - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -51,28 +66,41 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + # Applies to the H745/H747/H755/H757 # CRYP and HASH are unavailable on the H745/H747 CRYP: _include: patches/cryp/merge_fields.yaml +DAC: + _strip: DAC_ + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -95,12 +123,27 @@ DSIHOST: - patches/dsi/h7-desc.yaml - collect/dsi/isr.yaml +Ethernet_DMA: + DMASBMR: + _modify: + RB: + access: read-write + MB: + access: read-write + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_dualcore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -110,10 +153,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO_ _include: - patches/gpio/add_r_suffix.yaml @@ -130,22 +174,29 @@ HASH: - collect/hash/v2.yaml HSEM: + _strip: HSEM_ _include: - patches/hsem/h7_dual.yaml - patches/hsem/h7_dual_cm4.yaml - collect/hsem/r.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG1: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -159,19 +210,37 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml +OPAMP: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + +PWR: + _strip: PWR_ + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/h7_dual.yaml + QUADSPI: _strip: QUADSPI_ _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _include: - - patches/pwr/h7_dual.yaml +RAMECC[13]: {} RCC: _delete: @@ -198,11 +267,13 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - collect/rtc/alarm.yaml @@ -210,8 +281,6 @@ RTC: SAI4: _strip: SAI_ - -SAI?: _include: - patches/sai/h7.yaml - patches/sai/h7_mcken.yaml @@ -219,7 +288,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -227,6 +300,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -302,13 +377,16 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_dualcore.yaml + - patches/h743_hrtim_common.yaml - patches/ethernet/h7_combined_desc.yaml - patches/flash/h7_dualcore.yaml - patches/h7_spdifrx.yaml diff --git a/devices/stm32h757cm4.yaml b/devices/stm32h757cm4.yaml index aa1347163..c677e3f7f 100644 --- a/devices/stm32h757cm4.yaml +++ b/devices/stm32h757cm4.yaml @@ -1,8 +1,13 @@ _svd: ../svd/stm32h757cm4.svd +_delete: + - RAMECC? # RAMECC definitions are so terrible + _modify: COMP1: groupName: COMP + Flash: + name: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -17,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -33,16 +38,26 @@ ADC3: SQR?: SQ*: [0, 19] +ART: {} + +AXI: + _strip: AXI_ + BDMA: _include: - patches/dma/bdma.yaml - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -51,28 +66,41 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + # Applies to the H745/H747/H755/H757 # CRYP and HASH are unavailable on the H745/H747 CRYP: _include: patches/cryp/merge_fields.yaml +DAC: + _strip: DAC_ + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -95,12 +123,27 @@ DSIHOST: - patches/dsi/h7-desc.yaml - collect/dsi/isr.yaml +Ethernet_DMA: + DMASBMR: + _modify: + RB: + access: read-write + MB: + access: read-write + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_dualcore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -110,10 +153,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO_ _include: - patches/gpio/add_r_suffix.yaml @@ -130,22 +174,29 @@ HASH: - collect/hash/v2.yaml HSEM: + _strip: HSEM_ _include: - patches/hsem/h7_dual.yaml - patches/hsem/h7_dual_cm4.yaml - collect/hsem/r.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG1: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -159,19 +210,37 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml +OPAMP: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + +PWR: + _strip: PWR_ + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/h7_dual.yaml + QUADSPI: _strip: QUADSPI_ _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _include: - - patches/pwr/h7_dual.yaml +RAMECC[13]: {} RCC: _delete: @@ -198,11 +267,13 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - collect/rtc/alarm.yaml @@ -210,8 +281,6 @@ RTC: SAI4: _strip: SAI_ - -SAI?: _include: - patches/sai/h7.yaml - patches/sai/h7_mcken.yaml @@ -219,7 +288,11 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -227,6 +300,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -302,13 +377,16 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_dualcore.yaml + - patches/h743_hrtim_common.yaml - patches/ethernet/h7_combined_desc.yaml - patches/flash/h7_dualcore.yaml - patches/h7_spdifrx.yaml diff --git a/devices/stm32h757cm7.yaml b/devices/stm32h757cm7.yaml index d47d918e2..d797356ce 100644 --- a/devices/stm32h757cm7.yaml +++ b/devices/stm32h757cm7.yaml @@ -1,8 +1,13 @@ _svd: ../svd/stm32h757cm7.svd +_delete: + - RAMECC? # RAMECC definitions are so terrible + _modify: COMP1: groupName: COMP + Flash: + name: FLASH # TIM3, TIM4, TIM12, TIM13, TIM14 are 16-bit, whilst TIM2 is 32-bit _copy: @@ -17,7 +22,7 @@ _derive: TIM4: TIM3 TIM14: TIM13 -ADC*_Common: +ADC3_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC3: @@ -33,7 +38,10 @@ ADC3: SQR?: SQ*: [0, 19] +ART: {} + AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml @@ -43,10 +51,15 @@ BDMA: - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml +COMP1: {} + CRC: _include: - patches/crc/crc_rename_init.yaml @@ -55,28 +68,41 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + # Applies to the H745/H747/H755/H757 # CRYP and HASH are unavailable on the H745/H747 CRYP: _include: patches/cryp/merge_fields.yaml +DAC: + _strip: DAC_ + +DBGMCU: {} + +DCMI: {} + DFSDM: _include: - patches/dfsdm/h735_747_753.yaml - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -99,12 +125,27 @@ DSIHOST: - patches/dsi/h7-desc.yaml - collect/dsi/isr.yaml +Ethernet_DMA: + DMASBMR: + _modify: + RB: + access: read-write + MB: + access: read-write + +Ethernet_MAC: + _include: + - patches/ethernet/mac_lpiet_3.yaml + +Ethernet_MTL: {} + EXTI: _include: - patches/exti/h7_dualcore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN1: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -114,10 +155,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO_ _include: - patches/gpio/add_r_suffix.yaml @@ -134,21 +176,28 @@ HASH: - collect/hash/v2.yaml HSEM: + _strip: HSEM_ _include: - patches/hsem/h7_dual.yaml - collect/hsem/r.yaml -I2C?: +I2C1: + _strip: I2C_ _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG1: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -162,19 +211,37 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml +OPAMP: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + +PWR: + _strip: PWR_ + _include: + - patches/pwr/add_step_down.yaml + - patches/pwr/h7_dual.yaml + QUADSPI: _strip: QUADSPI_ _include: - patches/quadspi/dr_multi_access.yaml - fields/quadspi/quadspi_v1_dual_flash.yaml -PWR: - _include: - - patches/pwr/h7_dual.yaml +RAMECC[13]: {} RCC: _delete: @@ -201,11 +268,13 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/rtc_common.yaml @@ -215,8 +284,6 @@ RTC: SAI4: _strip: SAI_ - -SAI?: _include: - patches/sai/h7.yaml - patches/sai/h7_mcken.yaml @@ -224,7 +291,9 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -232,6 +301,8 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + SYSCFG: _include: - patches/syscfg/h74x_pwrcr.yaml @@ -307,13 +378,16 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: {} + WWDG1: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml _include: - - patches/h7_common_dualcore.yaml + - patches/h743_hrtim_common.yaml - patches/ethernet/h7_combined_desc.yaml - patches/flash/h7_dualcore.yaml - patches/h7_spdifrx.yaml diff --git a/devices/stm32h7a3.yaml b/devices/stm32h7a3.yaml index 53ff792eb..4f1083fa0 100644 --- a/devices/stm32h7a3.yaml +++ b/devices/stm32h7a3.yaml @@ -27,7 +27,7 @@ _modify: OctoSPII_O_Manager: groupName: OctoSPII_O_Manager -ADC*_Common: +ADC12_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC[12]: @@ -44,16 +44,21 @@ ADC[12]: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml -BDMA?: +BDMA1: + _strip: BDMA_ _include: - patches/dma/bdma_v2.yaml - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml @@ -68,23 +73,36 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml -DFSDM*: +CRS: + _strip: CRS_ + +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCMI: {} + +DFSDM1: _strip: DFSDM_ _include: - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -102,11 +120,15 @@ DMAMUX2: - collect/dma/h7_dmamux.yaml EXTI: + _delete: + _interrupts: + - ECC _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN[12]: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -134,10 +156,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -149,20 +172,26 @@ GPIO[BC]: _include: collect/gpio/v2_derive.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -176,17 +205,45 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml -OCTOSPI?: +OCTOSPI2: _include: - patches/octospi/h7.yaml +OctoSPII_O_Manager: {} + +OPAMP: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + PSSI: _strip: PSSI_ +PWR: + _strip: PWR_ + _delete: + _interrupts: WWDG1_RST # Doesn't exist at all on these parts + +RAMECC: + _add: + _interrupts: + RAMECC: + description: ECC diagnostic global interrupt + value: 145 + RCC: _strip: - RCC_ @@ -196,25 +253,25 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml SAI1: + _strip: SAI_ _add: _interrupts: SAI1: description: SAI1 global interrupt value: 87 - -SAI?: - _strip: SAI_ _include: - patches/sai/h7.yaml - patches/sai/h7_mcken.yaml @@ -222,7 +279,12 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: + _strip: SDMMC_ + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -230,6 +292,10 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + +SYSCFG: {} + TAMP: _strip: TAMP_ @@ -322,7 +388,11 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml diff --git a/devices/stm32h7b0.yaml b/devices/stm32h7b0.yaml index c7a6ba255..17de9510e 100644 --- a/devices/stm32h7b0.yaml +++ b/devices/stm32h7b0.yaml @@ -25,7 +25,7 @@ _modify: OctoSPII_O_Manager: groupName: OctoSPII_O_Manager -ADC*_Common: +ADC12_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC[12]: @@ -42,16 +42,21 @@ ADC[12]: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml -BDMA?: +BDMA2: + _strip: BDMA_ _include: - patches/dma/bdma_v2.yaml - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml @@ -66,28 +71,41 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + # Applies to the H7A3/H7B3 # CRYP and HASH are unavailable on the H7A3 CRYP: _include: patches/cryp/merge_fields.yaml -DFSDM*: +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCMI: {} + +DFSDM1: _strip: DFSDM_ _include: - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -105,11 +123,15 @@ DMAMUX2: - collect/dma/h7_dmamux.yaml EXTI: + _delete: + _interrupts: + - ECC _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN[12]: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -137,10 +159,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -156,20 +179,26 @@ HASH: - collect/hash/v2.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -183,17 +212,47 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml -OCTOSPI?: +OCTOSPI2: _include: - patches/octospi/h7.yaml +OctoSPII_O_Manager: {} + +OPAMP: {} + +OTFDEC1: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + PSSI: _strip: PSSI_ +PWR: + _strip: PWR_ + _delete: + _interrupts: WWDG1_RST # Doesn't exist at all on these parts + +RAMECC: + _add: + _interrupts: + RAMECC: + description: ECC diagnostic global interrupt + value: 145 + RCC: _strip: - RCC_ @@ -203,17 +262,19 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SAI?: +SAI1: _strip: SAI_ _include: - patches/sai/h7.yaml @@ -222,7 +283,12 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: + _strip: SDMMC_ + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -230,6 +296,10 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + +SYSCFG: {} + TAMP: _strip: TAMP_ @@ -303,7 +373,11 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml diff --git a/devices/stm32h7b3.yaml b/devices/stm32h7b3.yaml index 3dfc64649..5032c4e1b 100644 --- a/devices/stm32h7b3.yaml +++ b/devices/stm32h7b3.yaml @@ -27,7 +27,7 @@ _modify: OctoSPII_O_Manager: groupName: OctoSPII_O_Manager -ADC*_Common: +ADC12_Common: _include: fields/adc/adc_v3_common_h7.yaml ADC[12]: @@ -44,16 +44,21 @@ ADC[12]: SQ*: [0, 19] AXI: + _strip: AXI_ _include: - fields/axi/axi_v1.yaml -BDMA?: +BDMA1: + _strip: BDMA_ _include: - patches/dma/bdma_v2.yaml - fields/dma/bdma.yaml - collect/dma/bdma.yaml +CAN_CCU: {} + CEC: + _strip: CEC_ _include: - fields/hdmi_cec.yaml @@ -68,28 +73,41 @@ CRC: - fields/crc/crc_idr_32bit.yaml - fields/crc/crc_pol.yaml +CRS: + _strip: CRS_ + # Applies to the H7A3/H7B3 # CRYP and HASH are unavailable on the H7A3 CRYP: _include: patches/cryp/merge_fields.yaml -DFSDM*: +DAC1: + _strip: DAC_ + +DBGMCU: {} + +DCMI: {} + +DFSDM1: _strip: DFSDM_ _include: - collect/dfsdm/v1.yaml -DMA2D: - _include: - - patches/dma/dma2d_v2.yaml - - fields/dma/dma2d_v2.yaml +DELAY_Block_SDMMC1: {} -DMA?: +DMA1: _include: - patches/dma/fcr_wo.yaml - patches/dma/h7_dmacr.yaml - fields/dma/dma_v3.yaml - collect/dma/st.yaml +DMA2D: + _strip: DMA2D_ + _include: + - patches/dma/dma2d_v2.yaml + - fields/dma/dma2d_v2.yaml + DMAMUX1: _strip: DMAMUX?_ _include: @@ -107,11 +125,15 @@ DMAMUX2: - collect/dma/h7_dmamux.yaml EXTI: + _delete: + _interrupts: + - ECC _include: - patches/exti/h7_singlecore.yaml - fields/exti/exti_h7.yaml -FDCAN?: +FDCAN[12]: + _strip: FDCAN_ _include: - patches/fdcan/fdcan_h7.yaml @@ -139,10 +161,11 @@ FLASH: - collect/flash/bank.yaml FMC: + _strip: FMC_ _include: - collect/fsmc/sdram.yaml -GPIO?: +GPIO[ABC]: _include: - patches/gpio/add_r_suffix.yaml - fields/gpio/v2/common.yaml @@ -158,20 +181,26 @@ HASH: - collect/hash/v2.yaml HSEM: + _strip: HSEM_ _include: - collect/hsem/r.yaml -I2C?: +I2C1: _include: - patches/i2c/merge_CR2_SADDx_fields.yaml - fields/i2c/v2.yaml IWDG: + _strip: IWDG_ _include: - patches/16bit.yaml - fields/iwdg/iwdg_with_WINR.yaml -LPTIM?: +JPEG: + _strip: JPEG_ + +LPTIM[13]: + _strip: LPTIM_ _include: - fields/lptim/lptim_v1.yaml @@ -185,17 +214,47 @@ LTDC: - fields/ltdc/ltdc.yaml - collect/ltdc/layer.yaml +MDIOS: + _strip: MDIOS_ + MDMA: + _strip: MDMA_ _include: - collect/dma/mdma.yaml -OCTOSPI?: +OCTOSPI2: _include: - patches/octospi/h7.yaml +OctoSPII_O_Manager: {} + +OPAMP: {} + +OTFDEC1: {} + +OTG1_HS_*: + _strip: OTG_HS_ + +OTG1_HS_DEVICE: {} +OTG1_HS_GLOBAL: {} +OTG1_HS_HOST: {} +OTG1_HS_PWRCLK: {} + PSSI: _strip: PSSI_ +PWR: + _strip: PWR_ + _delete: + _interrupts: WWDG1_RST # Doesn't exist at all on these parts + +RAMECC: + _add: + _interrupts: + RAMECC: + description: ECC diagnostic global interrupt + value: 145 + RCC: _strip: - RCC_ @@ -205,25 +264,25 @@ RCC: - fields/rcc/v3/h7_revision_v.yaml RNG: + _strip: RNG_ _include: - fields/rng/rng_v1.yaml - fields/rng/rng_v1_ced.yaml RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml SAI1: + _strip: SAI_ _add: _interrupts: SAI1: description: SAI1 global interrupt value: 87 - -SAI?: - _strip: SAI_ _include: - patches/sai/h7.yaml - patches/sai/h7_mcken.yaml @@ -231,7 +290,12 @@ SAI?: - collect/sai/ch.yaml - collect/sai/pdm.yaml -SPI?: +SDMMC1: + _strip: SDMMC_ + +SPDIFRX: {} + +SPI1: _include: - patches/spi/rxtxdr.yaml - patches/spi/h7_2.yaml @@ -239,6 +303,10 @@ SPI?: - fields/spi/spi_v3_tser.yaml - fields/spi/spi_v3_cfg1_udrdet_udrcfg.yaml +SWPMI: {} + +SYSCFG: {} + TAMP: _strip: TAMP_ @@ -331,7 +399,11 @@ USART1: - patches/usart/tcbgtc.yaml - fields/usart/v4/B.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: + _strip: WWDG_ _include: - patches/wwdg/h7.yaml - fields/wwdg/wwdg_v2.yaml diff --git a/devices/stm32h7r.yaml b/devices/stm32h7r.yaml index 496ee4790..b3d65c5ab 100644 --- a/devices/stm32h7r.yaml +++ b/devices/stm32h7r.yaml @@ -2,30 +2,94 @@ _svd: ../svd/stm32h7r.svd _clear_fields: "*" +_derive: + LPTIM2: LPTIM1 + LPTIM3: LPTIM1 + LPTIM5: LPTIM4 + + TIM3: TIM2 + TIM4: TIM2 + TIM5: TIM2 + TIM7: TIM6 + TIM12: TIM9 + TIM14: TIM13 + TIM17: TIM16 + _modify: FDCAN1: groupName: FDCAN SPI1: groupName: SPI +ADC12_common: + _strip: ADC_ + ADC1: _strip: ADC_ CFGR: _merge: EXTSEL* +ADF: + _strip: ADF_ + +CEC: + _strip: CEC_ + +CORDIC: + _strip: CORDIC_ + +CRC: + _strip: CRC_ + +CRS: + _strip: CRS_ + +DBGMCU: + _strip: DBGMCU_ + +DCMIPP: + _strip: DCMIPP_ + +DLYB1: + _strip: DLYB_ + DMA2D: + _strip: DMA2D_ _include: - collect/dma/dma2d_clut.yaml +DTS: + _strip: DTS_ + +ETH: + _strip: ETH_ + +EXTI: + _strip: EXTI_ + +FDCAN1: + _strip: FDCAN_ + +FLASH: + _strip: FLASH_ + +FMC: + _strip: FMC_ + GFXMMU: + _strip: GFXMMU_ _include: - collect/gfxmmu/lut.yaml +GFXTIM: + _strip: GFXTIM_ + GPDMA: + _strip: GPDMA_ _include: - collect/dma/gpdma/h7rs_u5.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO?_ _include: - fields/gpio/v3/common.yaml @@ -38,20 +102,36 @@ GPIO[BC]: _include: collect/gpio/v2r_derive.yaml HASH: + _strip: HASH_ _include: - collect/hash/v3.yaml HPDMA: + _strip: HPDMA_ _include: - collect/dma/hpdma.yaml +I2C1_I3C1: + _strip: I2C_ + +ICACHE: + _strip: ICACHE_ + IWDG: + _strip: IWDG_ _include: patches/16bit_with_mask.yaml JPEG: + _strip: JPEG_ _include: - collect/jpeg/ram_h7rs.yaml +LPTIM1: + _strip: LPTIM1_ + +LPTIM4: + _strip: LPTIM4_ + LPUART1: _strip: LPUART_ _include: @@ -59,29 +139,69 @@ LPUART1: - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml +LTDC: + _strip: LTDC_ + +MDIOS: + _strip: MDIOS_ + +OTG_HS: + _strip: OTG_ + +PSSI: + _strip: PSSI_ + +PWR: + _strip: PWR_ + +RAMCFG: + _strip: RAMECC_ + RCC: + _strip: RCC_ _include: + - patches/rcc/h7+.yaml - fields/rcc/v3/h7rs.yaml +RNG: + _strip: RNG_ + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SDMMC?: +SAI1: + _strip: SAI_ + +SBS: + _strip: SBS_ + _include: + - patches/sbs/h7+.yaml + +SDMMC1: _strip: SDMMC_ _include: - collect/sdmmc/fifo.yaml +SPDIFRX: + _strip: SPDIFRX_ + +SPI1: + _strip: SPI_ + SPI?: _include: patches/spi/rxtxdr.yaml TAMP: + _strip: TAMP_ _include: - collect/tamp/bkp.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/ccmr1_alternate.yaml - patches/tim/ccmr2_alternate.yaml @@ -90,6 +210,7 @@ TIM1: - collect/tim/ccr.yaml TIM2: + _strip: TIM2_ CNT: _modify: UIFCPY_CNT: @@ -104,10 +225,12 @@ TIM2: - collect/tim/ccr.yaml TIM6: + _strip: TIM6_ _include: - fields/tim/v3/tim6.yaml TIM9: + _strip: TIM9_ _include: - patches/tim/ccmr1_alternate.yaml - patches/tim/v2/ocm1_bit3.yaml @@ -115,12 +238,14 @@ TIM9: - collect/tim/ccr.yaml TIM13: + _strip: TIM13_ _include: - patches/tim/ccmr1_alternate.yaml - fields/tim/v3/tim13.yaml - collect/tim/ccr.yaml TIM15: + _strip: TIM15_ _include: - patches/tim/ccmr1_alternate.yaml - patches/tim/v2/ocm1_bit3.yaml @@ -128,6 +253,7 @@ TIM15: - collect/tim/ccr.yaml TIM16: + _strip: TIM16_ _include: - patches/tim/ccmr1_alternate.yaml - fields/tim/v3/tim16.yaml @@ -135,6 +261,7 @@ TIM16: - collect/tim/ccr.yaml UCPD: + _strip: UCPD_ _include: - patches/ucpd/rxordseten_split.yaml - fields/ucpd/ucpd_v1.yaml @@ -146,8 +273,17 @@ USART1: - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/B.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: patches/16bit_with_mask.yaml +XSPI1: + _strip: XSPI_ + +XSPIM1: + _strip: XSPIM_ + _include: - - patches/h7_common_bootflash.yaml + - patches/gpio/h7_mnop.yaml diff --git a/devices/stm32h7s.yaml b/devices/stm32h7s.yaml index 0651cfab4..7311ad8aa 100644 --- a/devices/stm32h7s.yaml +++ b/devices/stm32h7s.yaml @@ -2,17 +2,48 @@ _svd: ../svd/stm32h7s.svd _clear_fields: "*" +_derive: + LPTIM2: LPTIM1 + LPTIM3: LPTIM1 + LPTIM5: LPTIM4 + + TIM3: TIM2 + TIM4: TIM2 + TIM5: TIM2 + TIM7: TIM6 + TIM12: TIM9 + TIM14: TIM13 + TIM17: TIM16 + _modify: FDCAN1: groupName: FDCAN SPI1: groupName: SPI +ADC12_common: + _strip: ADC_ + ADC1: _strip: ADC_ CFGR: _merge: EXTSEL* +ADF: + _strip: ADF_ + +CEC: + _strip: CEC_ + +CORDIC: + _strip: CORDIC_ + +CRC: + _strip: CRC_ + +CRS: + _strip: CRS_ + CRYP: _strip: CRYP_ _cluster: @@ -27,19 +58,52 @@ CRYP: CSGCMCCM?R: {} CSGCM?R: {} +DBGMCU: + _strip: DBGMCU_ + +DCMIPP: + _strip: DCMIPP_ + +DLYB1: + _strip: DLYB_ + DMA2D: + _strip: DMA2D_ _include: - collect/dma/dma2d_clut.yaml +DTS: + _strip: DTS_ + +ETH: + _strip: ETH_ + +EXTI: + _strip: EXTI_ + +FDCAN1: + _strip: FDCAN_ + +FLASH: + _strip: FLASH_ + +FMC: + _strip: FMC_ + GFXMMU: + _strip: GFXMMU_ _include: - collect/gfxmmu/lut.yaml +GFXTIM: + _strip: GFXTIM_ + GPDMA: + _strip: GPDMA_ _include: - collect/dma/gpdma/h7rs_u5.yaml -GPIO?: +GPIO[ABC]: _strip: GPIO?_ _include: - fields/gpio/v3/common.yaml @@ -52,20 +116,36 @@ GPIO[BC]: _include: collect/gpio/v2r_derive.yaml HASH: + _strip: HASH_ _include: - collect/hash/v3.yaml HPDMA: + _strip: HPDMA_ _include: - collect/dma/hpdma.yaml +I2C1_I3C1: + _strip: I2C_ + +ICACHE: + _strip: ICACHE_ + IWDG: + _strip: IWDG_ _include: patches/16bit_with_mask.yaml JPEG: + _strip: JPEG_ _include: - collect/jpeg/ram_h7rs.yaml +LPTIM1: + _strip: LPTIM1_ + +LPTIM4: + _strip: LPTIM4_ + LPUART1: _strip: LPUART_ _include: @@ -73,32 +153,76 @@ LPUART1: - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/lp_wl.yaml -MCE*: +LTDC: + _strip: LTDC_ + +MCE1: _strip: MCE_ +MDIOS: + _strip: MDIOS_ + +OTG_HS: + _strip: OTG_ + PKA: _strip: PKA_ +PSSI: + _strip: PSSI_ + +PWR: + _strip: PWR_ + +RAMCFG: + _strip: RAMECC_ + RCC: + _strip: RCC_ _include: + - patches/rcc/h7+.yaml - fields/rcc/v3/h7rs.yaml +RNG: + _strip: RNG_ + RTC: + _strip: RTC_ _include: - patches/rtc/alarm.yaml - fields/rtc/v3.yaml - collect/rtc/alarm.yaml -SDMMC?: +SAES: + _strip: SAES_ + +SAI1: + _strip: SAI_ + +SBS: + _strip: SBS_ + _include: + - patches/sbs/h7+.yaml + +SDMMC1: _strip: SDMMC_ _include: - collect/sdmmc/fifo.yaml +SPDIFRX: + _strip: SPDIFRX_ + +SPI1: + _strip: SPI_ + _include: patches/spi/rxtxdr.yaml + TAMP: + _strip: TAMP_ _include: - collect/tamp/bkp.yaml TIM1: + _strip: TIM1_ _include: - patches/tim/ccmr1_alternate.yaml - patches/tim/ccmr2_alternate.yaml @@ -107,6 +231,7 @@ TIM1: - collect/tim/ccr.yaml TIM2: + _strip: TIM2_ CNT: _modify: UIFCPY_CNT: @@ -121,10 +246,12 @@ TIM2: - collect/tim/ccr.yaml TIM6: + _strip: TIM6_ _include: - fields/tim/v3/tim6.yaml TIM9: + _strip: TIM9_ _include: - patches/tim/ccmr1_alternate.yaml - patches/tim/v2/ocm1_bit3.yaml @@ -132,12 +259,14 @@ TIM9: - collect/tim/ccr.yaml TIM13: + _strip: TIM13_ _include: - patches/tim/ccmr1_alternate.yaml - fields/tim/v3/tim13.yaml - collect/tim/ccr.yaml TIM15: + _strip: TIM15_ _include: - patches/tim/ccmr1_alternate.yaml - patches/tim/v2/ocm1_bit3.yaml @@ -145,19 +274,15 @@ TIM15: - collect/tim/ccr.yaml TIM16: + _strip: TIM16_ _include: - patches/tim/ccmr1_alternate.yaml - fields/tim/v3/tim16.yaml - fields/tim/v3/occe.yaml - collect/tim/ccr.yaml -SAES: - _strip: SAES_ - -SPI?: - _include: patches/spi/rxtxdr.yaml - UCPD: + _strip: UCPD_ _include: - patches/ucpd/rxordseten_split.yaml - fields/ucpd/ucpd_v1.yaml @@ -169,9 +294,18 @@ USART1: - patches/usart/merge_CR3_WUS_field.yaml - fields/usart/v4/B.yaml +VREFBUF: + _strip: VREFBUF_ + WWDG: _include: patches/16bit_with_mask.yaml +XSPI1: + _strip: XSPI_ + +XSPIM1: + _strip: XSPIM_ + _include: - - patches/h7_common_bootflash.yaml + - patches/gpio/h7_mnop.yaml - collect/mce/v1.yaml From 69b2a552c422915379f693c5e1af8d75a605e880 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Fri, 7 Feb 2025 11:17:22 +0300 Subject: [PATCH 13/13] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aac01551..95d181fe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * USART: refactor and add missing enums * STM32H503: Add missing RNG_NSCR register * Refactor timers, add enums +* Add placeholders for all peripherals * STM32H5xx: Add H533 (#1129) * G4: Fix swapped reset values for SPI4 CR1 and CR2 by deriving SPI4 from SPI1 (#957) * STM32H5xx: Update SVD to version 1.7 and add H523 (#1124) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy