diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2019-06-11 11:43:14 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-06-13 08:22:47 +0200 |
| commit | 09c9203cac8728926db8457ddaa88856afe014d9 (patch) | |
| tree | a5b93d410d067d7601ebbf765c9e68cb6a263a38 | |
| parent | afa8665f9f1a5666c63db762fcad53e7425126ef (diff) | |
| download | barebox-09c9203cac8728926db8457ddaa88856afe014d9.tar.gz barebox-09c9203cac8728926db8457ddaa88856afe014d9.tar.xz | |
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 <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/configs/stm32mp_defconfig (renamed from arch/arm/configs/stm32mp1_defconfig) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-stm32mp/Kconfig (renamed from arch/arm/mach-stm32mp1/Kconfig) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-stm32mp/Makefile (renamed from arch/arm/mach-stm32mp1/Makefile) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-stm32mp/include/mach/debug_ll.h (renamed from arch/arm/mach-stm32mp1/include/mach/debug_ll.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-stm32mp/include/mach/stm32.h (renamed from arch/arm/mach-stm32mp1/include/mach/stm32.h) | 0 | ||||
| -rw-r--r-- | images/Makefile | 2 | ||||
| -rw-r--r-- | images/Makefile.stm32mp (renamed from images/Makefile.stm32mp1) | 0 |
9 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 480c6f0117..1d4b6e09ce 100644 --- 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 index 4d54f339f1..5cb46f6613 100644 --- 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 b/arch/arm/configs/stm32mp_defconfig index 2922ce3632..657b2edf57 100644 --- a/arch/arm/configs/stm32mp1_defconfig +++ b/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 b/arch/arm/mach-stm32mp/Kconfig index cc7cf23cfb..bcf7293c46 100644 --- a/arch/arm/mach-stm32mp1/Kconfig +++ b/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 b/arch/arm/mach-stm32mp/Makefile index 16a218658a..16a218658a 100644 --- a/arch/arm/mach-stm32mp1/Makefile +++ b/arch/arm/mach-stm32mp/Makefile diff --git a/arch/arm/mach-stm32mp1/include/mach/debug_ll.h b/arch/arm/mach-stm32mp/include/mach/debug_ll.h index 99fedb91fe..99fedb91fe 100644 --- a/arch/arm/mach-stm32mp1/include/mach/debug_ll.h +++ b/arch/arm/mach-stm32mp/include/mach/debug_ll.h diff --git a/arch/arm/mach-stm32mp1/include/mach/stm32.h b/arch/arm/mach-stm32mp/include/mach/stm32.h index f9bdb788b9..f9bdb788b9 100644 --- a/arch/arm/mach-stm32mp1/include/mach/stm32.h +++ b/arch/arm/mach-stm32mp/include/mach/stm32.h diff --git a/images/Makefile b/images/Makefile index 479647a827..293e644319 100644 --- 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 b/images/Makefile.stm32mp index d26231cd92..d26231cd92 100644 --- a/images/Makefile.stm32mp1 +++ b/images/Makefile.stm32mp |