rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32

Have this symbol follow the pattern of all other such symbols.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6152b11b107b3c58d4010fb6015d37131808964f..ef7da2787796b2ee84a1015cb01f164d4523d0cd 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1607,7 +1607,7 @@ config ARCH_UNIPHIER
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)
 
-config STM32
+config ARCH_STM32
        bool "Support STMicroelectronics STM32 MCU with cortex M"
        select CPU_V7M
        select DM

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e91b37fb3401185bc5ae8c23e965c94b8fa8cb21..94eb50bf721b70bfc36556dc28b5aa182a04ea83 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -73,7 +73,7 @@ machine-$(CONFIG_ARCH_ROCKCHIP)               += rockchip
 machine-$(CONFIG_ARCH_S5PC1XX)         += s5pc1xx
 machine-$(CONFIG_ARCH_SNAPDRAGON)      += snapdragon
 machine-$(CONFIG_ARCH_SOCFPGA)         += socfpga
-machine-$(CONFIG_STM32)                        += stm32
+machine-$(CONFIG_ARCH_STM32)           += stm32
 machine-$(CONFIG_ARCH_STM32MP)         += stm32mp
 machine-$(CONFIG_ARCH_SUNXI)           += sunxi
 machine-$(CONFIG_ARCH_TEGRA)           += tegra

diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig
index cea5ee2ce54a46cb9a725e76d9d9697950327c0e..b42b05669a12f8c221afc516eb3802b3fd72a2aa 100644 (file)
--- a/arch/arm/mach-stm32/Kconfig
+++ b/arch/arm/mach-stm32/Kconfig
@@ -1,4 +1,4 @@
-if STM32
+if ARCH_STM32
 
 config STM32F4
        bool "stm32f4 family"

diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
index 52a577f97ba62ffb847b6d4af51a8e9171f28c8f..da43317ae5868cef32e6f92f687b8a64d8d65ef0 100644 (file)
--- a/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
 CONFIG_SYS_TEXT_BASE=0x08000000
 CONFIG_SYS_MALLOC_F_LEN=0xF00
 CONFIG_ENV_SIZE=0x2000

diff --git a/configs/stm32f429-evaluation_defconfig b/configs/stm32f429-evaluation_defconfig
index 24f79b51bf4d2e06fe705e5b36ee1597cec56ff2..f67ce3e407a284bf9a2237bdd5cf665189ae14b7 100644 (file)
--- a/configs/stm32f429-evaluation_defconfig
+++ b/configs/stm32f429-evaluation_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
 CONFIG_SYS_TEXT_BASE=0x08000000
 CONFIG_SYS_MALLOC_F_LEN=0xF00
 CONFIG_ENV_SIZE=0x2000

diff --git a/configs/stm32f469-discovery_defconfig b/configs/stm32f469-discovery_defconfig
index 0ab00514d555fa63bbda0d339a830932ae811fcf..082fb0cc19dfd8749817165ab7e8cac8c9fd4749 100644 (file)
--- a/configs/stm32f469-discovery_defconfig
+++ b/configs/stm32f469-discovery_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
 CONFIG_SYS_TEXT_BASE=0x08000000
 CONFIG_SYS_MALLOC_F_LEN=0xF00
 CONFIG_ENV_SIZE=0x2000

diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig
index cdfa8bbbc4bd2187278e8d2f7553b9276bc532bc..be030bfb3714139c9a11bf8e969d1518253191dc 100644 (file)
--- a/configs/stm32f746-disco_defconfig
+++ b/configs/stm32f746-disco_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
 CONFIG_SYS_TEXT_BASE=0x08008000
 CONFIG_SYS_MALLOC_F_LEN=0xE00
 CONFIG_ENV_SIZE=0x2000

diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig
index c40730e14a962c41fa7ce6b60d4043fefa13c9bd..09fbcc968fc5a80d7c410f8e9f289b45fc09db43 100644 (file)
--- a/configs/stm32f769-disco_defconfig
+++ b/configs/stm32f769-disco_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
 CONFIG_SYS_TEXT_BASE=0x08008000
 CONFIG_SYS_MALLOC_F_LEN=0xE00
 CONFIG_ENV_SIZE=0x2000

diff --git a/configs/stm32h743-disco_defconfig b/configs/stm32h743-disco_defconfig
index 6b7a1d6d682b2186ff8ac6ea051b8418349e5c93..21ea90a2c1a777c5d3c41e3e7048094a849d9b48 100644 (file)
--- a/configs/stm32h743-disco_defconfig
+++ b/configs/stm32h743-disco_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
 CONFIG_SYS_TEXT_BASE=0x08000000
 CONFIG_SYS_MALLOC_F_LEN=0xF00
 CONFIG_ENV_SIZE=0x2000

diff --git a/configs/stm32h743-eval_defconfig b/configs/stm32h743-eval_defconfig
index 7564d97707438d459a2211520942590f3536d8c9..432fce0181ce21261c068ab633be489c578f6733 100644 (file)
--- a/configs/stm32h743-eval_defconfig
+++ b/configs/stm32h743-eval_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
 CONFIG_SYS_TEXT_BASE=0x08000000
 CONFIG_SYS_MALLOC_F_LEN=0xF00
 CONFIG_ENV_SIZE=0x2000

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 2081520f42ebd46f9032d8058ea153214bdb9299..d87f6cc10517a7420e1a392e7563dfaa98b91f63 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -318,7 +318,7 @@ config PIC32_GPIO
 
 config STM32_GPIO
        bool "ST STM32 GPIO driver"
-       depends on DM_GPIO && (STM32 || ARCH_STM32MP)
+       depends on DM_GPIO && (ARCH_STM32 || ARCH_STM32MP)
        default y
        help
          Device model driver support for STM32 GPIO controller. It should be

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 766402745dddb286a28f356ba3147f03b703d64f..81ed9eb2090a5817d8bd4aca782808bd6f53e066 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -310,7 +310,7 @@ config STM32MP_FUSE
 
 config STM32_RCC
        bool "Enable RCC driver for the STM32 SoC's family"
-       depends on (STM32 || ARCH_STM32MP) && MISC
+       depends on (ARCH_STM32 || ARCH_STM32MP) && MISC
        help
          Enable the STM32 RCC driver. The RCC block (Reset and Clock Control
          block) is responsible of the management of the clock and reset

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 75ccd65799751d80da8b7d85a76eb20c9b43f35d..65101ab4e880ddaa50a7e4cbb1291c1e1677b440 100644 (file)
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -30,7 +30,7 @@ config STI_RESET
 
 config STM32_RESET
        bool "Enable the STM32 reset"
-       depends on STM32 || ARCH_STM32MP
+       depends on ARCH_STM32 || ARCH_STM32MP
        help
          Support for reset controllers on STMicroelectronics STM32 family SoCs.
          This resset driver is compatible with STM32 F4/F7 and H7 SoCs.