This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 968005810c9e770d1ebcde2746043fc8541f52b0 Author: raiden00pl <[email protected]> AuthorDate: Sun Aug 16 11:44:57 2026 +0200 arch/arm/stm32wb: use common Kconfig symbols The flash header documents CONFIG_STM32WB_FLASH_CONFIG_x and the RCC tests CONFIG_STM32WB_AES1/AES2, which no Kconfig defines. Use the common CONFIG_STM32_* names. Signed-off-by: raiden00pl <[email protected]> Assisted-by: Claude Code --- arch/arm/src/stm32wb/hardware/stm32wb_flash.h | 4 ++-- arch/arm/src/stm32wb/stm32wb_rcc.c | 4 ++-- arch/arm/src/stm32wb/stm32wb_tim.c | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/src/stm32wb/hardware/stm32wb_flash.h b/arch/arm/src/stm32wb/hardware/stm32wb_flash.h index 0aad9fd84aa..ee55e17fd9a 100644 --- a/arch/arm/src/stm32wb/hardware/stm32wb_flash.h +++ b/arch/arm/src/stm32wb/hardware/stm32wb_flash.h @@ -36,9 +36,9 @@ /* Flash size is known from the chip selection: * * When CONFIG_STM32_FLASH_OVERRIDE_DEFAULT is set the - * CONFIG_STM32WB_FLASH_CONFIG_x selects the default FLASH size based on + * CONFIG_STM32_FLASH_CONFIG_x selects the default FLASH size based on * the chip part number. This value can be overridden with - * CONFIG_STM32WB_FLASH_OVERRIDE_x + * CONFIG_STM32_FLASH_OVERRIDE_x * * Parts STM32WB3xxC have 256Kb of FLASH * Parts STM32WB5xxC have 256Kb of FLASH diff --git a/arch/arm/src/stm32wb/stm32wb_rcc.c b/arch/arm/src/stm32wb/stm32wb_rcc.c index d7dd502e49b..bd2878d4523 100644 --- a/arch/arm/src/stm32wb/stm32wb_rcc.c +++ b/arch/arm/src/stm32wb/stm32wb_rcc.c @@ -218,7 +218,7 @@ static inline void rcc_enableahb2(void) regval |= RCC_AHB2ENR_ADCEN; #endif -#ifdef CONFIG_STM32WB_AES1 +#ifdef CONFIG_STM32_AES1 /* AES1 cryptographic accelerator clock enable */ regval |= RCC_AHB2ENR_AES1EN; @@ -257,7 +257,7 @@ static inline void rcc_enableahb3(void) regval |= RCC_AHB3ENR_PKAEN; #endif -#ifdef CONFIG_STM32WB_AES2 +#ifdef CONFIG_STM32_AES2 /* AES2 cryptographic accelerator clock enable */ regval |= RCC_AHB3ENR_AES2EN; diff --git a/arch/arm/src/stm32wb/stm32wb_tim.c b/arch/arm/src/stm32wb/stm32wb_tim.c index 561a0a45a4a..f581e58d3ae 100644 --- a/arch/arm/src/stm32wb/stm32wb_tim.c +++ b/arch/arm/src/stm32wb/stm32wb_tim.c @@ -52,16 +52,16 @@ * Such special purposes include: * * - To generate modulated outputs for such things as motor control. If - * CONFIG_STM32WB_TIMn is defined then the CONFIG_STM32WB_TIMn_PWM may also + * CONFIG_STM32_TIMn is defined then the CONFIG_STM32_TIMn_PWM may also * be defined to indicate that the timer is intended to be used for pulsed * output modulation. * - * - To control periodic ADC input sampling. If CONFIG_STM32WB_TIMn is - * defined then CONFIG_STM32WB_TIMn_ADC may also be defined to indicate + * - To control periodic ADC input sampling. If CONFIG_STM32_TIMn is + * defined then CONFIG_STM32_TIMn_ADC may also be defined to indicate * that timer "n" is intended to be used for that purpose. * - * - To use a Quadrature Encoder. If CONFIG_STM32WB_TIMn is defined then - * CONFIG_STM32WB_TIMn_QE may also be defined to indicate that timer "n" + * - To use a Quadrature Encoder. If CONFIG_STM32_TIMn is defined then + * CONFIG_STM32_TIMn_QE may also be defined to indicate that timer "n" * is intended to be used for that purpose. * * In any of these cases, the timer will not be used by this timer module. @@ -77,13 +77,13 @@ # undef CONFIG_STM32_TIM2 #endif -#if defined(CONFIG_STM32_TIM16_PWM) || defined (CONFIG_STM32WB_TIM16_ADC) || \ - defined(CONFIG_STM32WB_TIM16_QE) +#if defined(CONFIG_STM32_TIM16_PWM) || defined (CONFIG_STM32_TIM16_ADC) || \ + defined(CONFIG_STM32_TIM16_QE) # undef CONFIG_STM32_TIM16 #endif -#if defined(CONFIG_STM32_TIM17_PWM) || defined (CONFIG_STM32WB_TIM17_ADC) || \ - defined(CONFIG_STM32WB_TIM17_QE) +#if defined(CONFIG_STM32_TIM17_PWM) || defined (CONFIG_STM32_TIM17_ADC) || \ + defined(CONFIG_STM32_TIM17_QE) # undef CONFIG_STM32_TIM17 #endif
