Most peripheral driver are usable for both STM32 MPUs and MCUs, but so far we they were only used for STM32MP1. In preparation for adding MCU support, introduce a new ARCH_STM32 selected by ARCH_STM32MP and migrate common drivers to it. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- arch/arm/Kconfig | 7 +++++++ drivers/aiodev/Kconfig | 2 +- drivers/hw_random/Kconfig | 2 +- drivers/i2c/busses/Kconfig | 2 +- drivers/mci/Kconfig | 2 +- drivers/mfd/Kconfig | 2 +- drivers/pinctrl/Kconfig | 2 +- drivers/pwm/Kconfig | 2 +- drivers/regulator/Kconfig | 2 +- drivers/serial/Kconfig | 4 ++-- drivers/watchdog/Kconfig | 2 +- 11 files changed, 18 insertions(+), 11 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fecbe392333b..299e0ab08049 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -29,6 +29,12 @@ config TEXT_BASE menu "System Type" +config ARCH_STM32 + bool + help + Selected by both STM32 MCUs and MPUs to restrict driver + visibility. + choice prompt "ARM system type" @@ -185,6 +191,7 @@ config ARCH_S3C64xx config ARCH_STM32MP bool "STMicroelectronics STM32MP" + select ARCH_STM32 select CPU_V7 select HAVE_PBL_MULTI_IMAGES select CLKDEV_LOOKUP diff --git a/drivers/aiodev/Kconfig b/drivers/aiodev/Kconfig index b0af2ebfd382..88a3b9a3431c 100644 --- a/drivers/aiodev/Kconfig +++ b/drivers/aiodev/Kconfig @@ -46,7 +46,7 @@ config AM335X_ADC config STM32_ADC tristate "STM32 ADC driver" - depends on ARCH_STM32MP || COMPILE_TEST + depends on ARCH_STM32 || COMPILE_TEST help Support for ADC on STM32. Supports simple one-shot readings rather than continuous sampling with DMA, etc. ADC channels should be diff --git a/drivers/hw_random/Kconfig b/drivers/hw_random/Kconfig index 4b4200b5db5c..32b84b028b0e 100644 --- a/drivers/hw_random/Kconfig +++ b/drivers/hw_random/Kconfig @@ -17,7 +17,7 @@ config HWRNG_MXC_RNGC config HWRNG_STM32 tristate "STM32 Random Number Generator" - depends on ARCH_STM32MP || COMPILE_TEST + depends on ARCH_STM32 || COMPILE_TEST help This driver provides barebox support for the Random Number Generator hardware found on the STM32 family of MPUs and MCUs. diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index a551df537a69..d4e74552b7ad 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -60,7 +60,7 @@ config I2C_STM32 bool "STM32 I2C master driver" select RESET_CONTROLLER depends on HAVE_CLK - depends on ARCH_STM32MP || COMPILE_TEST + depends on ARCH_STM32 || COMPILE_TEST config I2C_RK3X tristate "Rockchip RK3xxx I2C adapter" diff --git a/drivers/mci/Kconfig b/drivers/mci/Kconfig index 95a73a761ca1..21d53c0c3f0b 100644 --- a/drivers/mci/Kconfig +++ b/drivers/mci/Kconfig @@ -206,7 +206,7 @@ config MCI_STM32_SDMMC2 bool "STMicroelectronics STM32H7 SD/MMC Host Controller support" depends on ARM_AMBA depends on RESET_CONTROLLER - depends on ARCH_STM32MP || COMPILE_TEST + depends on ARCH_STM32 || COMPILE_TEST help This selects support for the SD/MMC controller on STM32H7 SoCs. If you have a board based on such a SoC and with a SD/MMC slot, diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 160248072ab1..9d4a82a9bbb4 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -93,7 +93,7 @@ config SMSC_SUPERIO config MFD_STM32_TIMERS bool "STM32 Timers" - depends on ARCH_STM32MP || COMPILE_TEST + depends on ARCH_STM32 || COMPILE_TEST help Select this to get regmap support for the timer blocks on STM32 MCUs and MPUs. diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index d3d5c7be23cd..2ff99a39c877 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -102,7 +102,7 @@ config PINCTRL_VF610 config PINCTRL_STM32 bool "STM32 pinctrl support" if COMPILE_TEST - default y if ARCH_STM32MP + default y if ARCH_STM32 help Pinmux and GPIO controller found on STM32 family endif diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index 8219c1eaff7d..0b12278e80e7 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -38,7 +38,7 @@ config PWM_MXS config PWM_STM32 bool "STM32 PWM Support" - depends on ARCH_STM32MP || COMPILE_TEST + depends on ARCH_STM32 || COMPILE_TEST help This enables PWM support for STM32 MCUs and MPUs. diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 02cea362eb5d..c468e459153b 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -31,7 +31,7 @@ config REGULATOR_STM32_PWR config REGULATOR_STM32_VREFBUF tristate "STMicroelectronics STM32 VREFBUF" - depends on ARCH_STM32MP || COMPILE_TEST + depends on ARCH_STM32 || COMPILE_TEST help This driver supports STMicroelectronics STM32 VREFBUF (voltage reference buffer) which can be used as voltage reference for diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 8bf9fcd07e1b..9d4a534580ef 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -39,8 +39,8 @@ config DRIVER_SERIAL_IMX bool "i.MX serial driver" config DRIVER_SERIAL_STM32 - depends on ARCH_STM32MP - bool "stm32mp serial driver" + depends on ARCH_STM32 + bool "stm32 serial driver" config DRIVER_SERIAL_STM378X depends on ARCH_MXS diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b8772e016fe0..6f209e096ebe 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -97,7 +97,7 @@ config RAVE_SP_WATCHDOG config STM32_IWDG_WATCHDOG bool "STM32 IWDG" - depends on ARCH_STM32MP || COMPILE_TEST + depends on ARCH_STM32 || COMPILE_TEST select MFD_SYSCON help Enable to support configuration of the STM32's on-SoC IWDG watchdog. -- 2.30.2 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
