[PATCH v2 7/8] rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32

Trevor Woerner
2020-04-17T17:50:19Z

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

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

Changes in v2: added

arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 2 +-
arch/arm/mach-stm32/Kconfig | 2 +-
configs/stm32f429-discovery_defconfig | 2 +-
configs/stm32f429-evaluation_defconfig | 2 +-
configs/stm32f469-discovery_defconfig | 2 +-
configs/stm32f746-disco_defconfig | 2 +-
configs/stm32f769-disco_defconfig | 2 +-
configs/stm32h743-disco_defconfig | 2 +-
configs/stm32h743-eval_defconfig | 2 +-
drivers/gpio/Kconfig | 2 +-
drivers/misc/Kconfig | 2 +-
drivers/reset/Kconfig | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4b0cab553a..dee31952ca 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1563,7 +1563,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 e91b37fb34..94eb50bf72 100644
--- 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 cea5ee2ce5..b42b05669a 100644
--- 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 52a577f97b..da43317ae5 100644
--- 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 24f79b51bf..f67ce3e407 100644
--- 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 0ab00514d5..082fb0cc19 100644
--- 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 c9e22563a3..574bc61db0 100644
--- 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 19a7493d00..3f53c11c24 100644
--- 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 6b7a1d6d68..21ea90a2c1 100644
--- 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 7564d97707..432fce0181 100644
--- 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 2081520f42..d87f6cc105 100644
--- 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 766402745d..81ed9eb209 100644
--- 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 75ccd65799..65101ab4e8 100644
--- 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.
--
2.26.0.106.g9fadedd637