ARM: stm32mp1: rename to stm32mp

Serial and clk driver both depend on CONFIG_ARCH_STM32MP1, so either the Kconfig symbol or their depend needs to change. Patches posted by the vendor to Linux, U-Boot and their BSP Yocto-Layer speak of a STM32MP-Family of which the STM32MP1 is the first series, thus rename the arch by dropping the 1. Signed-off-by: Ahmad Fatoum <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
youxiaojie · Jun 13, 2019 · 09c9203 · 09c9203
1 parent afa8665
commit 09c9203
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -207,7 +207,7 @@ config ARCH_S3C64xx
 	select CPU_V6
 	select GENERIC_GPIO
 
-config ARCH_STM32MP1
+config ARCH_STM32MP
 	bool "ST stm32mp1xx"
 	select CPU_V7
 	select HAVE_PBL_MULTI_IMAGES
@@ -304,7 +304,7 @@ source "arch/arm/mach-pxa/Kconfig"
 source "arch/arm/mach-rockchip/Kconfig"
 source "arch/arm/mach-samsung/Kconfig"
 source "arch/arm/mach-socfpga/Kconfig"
-source "arch/arm/mach-stm32mp1/Kconfig"
+source "arch/arm/mach-stm32mp/Kconfig"
 source "arch/arm/mach-versatile/Kconfig"
 source "arch/arm/mach-vexpress/Kconfig"
 source "arch/arm/mach-tegra/Kconfig"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
@@ -98,7 +98,7 @@ machine-$(CONFIG_ARCH_PXA)		:= pxa
 machine-$(CONFIG_ARCH_ROCKCHIP)		:= rockchip
 machine-$(CONFIG_ARCH_SAMSUNG)		:= samsung
 machine-$(CONFIG_ARCH_SOCFPGA)		:= socfpga
-machine-$(CONFIG_ARCH_STM32MP1)		:= stm32mp1
+machine-$(CONFIG_ARCH_STM32MP)		:= stm32mp
 machine-$(CONFIG_ARCH_VERSATILE)	:= versatile
 machine-$(CONFIG_ARCH_VEXPRESS)		:= vexpress
 machine-$(CONFIG_ARCH_TEGRA)		:= tegra

diff --git a/arch/arm/configs/stm32mp1_defconfig → arch/arm/configs/stm32mp_defconfig b/arch/arm/configs/stm32mp1_defconfig → arch/arm/configs/stm32mp_defconfig
@@ -1,4 +1,4 @@
-CONFIG_ARCH_STM32MP1=y
+CONFIG_ARCH_STM32MP=y
 CONFIG_MACH_STM32MP157C_DK2=y
 CONFIG_THUMB2_BAREBOX=y
 CONFIG_ARM_BOARD_APPEND_ATAG=y

diff --git a/arch/arm/mach-stm32mp1/Kconfig → arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp1/Kconfig → arch/arm/mach-stm32mp/Kconfig
@@ -1,4 +1,4 @@
-if ARCH_STM32MP1
+if ARCH_STM32MP
 
 config ARCH_STM32MP1157
 	bool

diff --git a/arch/arm/mach-stm32mp1/Makefile → arch/arm/mach-stm32mp/Makefile b/arch/arm/mach-stm32mp1/Makefile → arch/arm/mach-stm32mp/Makefile
diff --git a/...arm/mach-stm32mp1/include/mach/debug_ll.h → .../arm/mach-stm32mp/include/mach/debug_ll.h b/...arm/mach-stm32mp1/include/mach/debug_ll.h → .../arm/mach-stm32mp/include/mach/debug_ll.h
diff --git a/arch/arm/mach-stm32mp1/include/mach/stm32.h → arch/arm/mach-stm32mp/include/mach/stm32.h b/arch/arm/mach-stm32mp1/include/mach/stm32.h → arch/arm/mach-stm32mp/include/mach/stm32.h
diff --git a/images/Makefile b/images/Makefile
@@ -140,7 +140,7 @@ include $(srctree)/images/Makefile.mxs
 include $(srctree)/images/Makefile.omap3
 include $(srctree)/images/Makefile.rockchip
 include $(srctree)/images/Makefile.socfpga
-include $(srctree)/images/Makefile.stm32mp1
+include $(srctree)/images/Makefile.stm32mp
 include $(srctree)/images/Makefile.tegra
 include $(srctree)/images/Makefile.vexpress
 include $(srctree)/images/Makefile.xburst

diff --git a/images/Makefile.stm32mp1 → images/Makefile.stm32mp b/images/Makefile.stm32mp1 → images/Makefile.stm32mp