From 727c62d29c3a0b982fb72ef993db95e9d2036e07 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 25 Jan 2016 20:44:10 +0900 Subject: ARM: mv78xx0: use "depends on" instead of "if" after prompt This platform recently moved to multi-platform, so missed the global fixup by commit e32465429490 ("ARM: use "depends on" for SoC configs instead of "if" after prompt"). Fix it now. Signed-off-by: Masahiro Yamada Signed-off-by: Gregory CLEMENT --- arch/arm/mach-mv78xx0/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-mv78xx0') diff --git a/arch/arm/mach-mv78xx0/Kconfig b/arch/arm/mach-mv78xx0/Kconfig index a32575fa3fba..c32f85559c65 100644 --- a/arch/arm/mach-mv78xx0/Kconfig +++ b/arch/arm/mach-mv78xx0/Kconfig @@ -1,5 +1,6 @@ menuconfig ARCH_MV78XX0 - bool "Marvell MV78xx0" if ARCH_MULTI_V5 + bool "Marvell MV78xx0" + depends on ARCH_MULTI_V5 select ARCH_REQUIRE_GPIOLIB select CPU_FEROCEON select MVEBU_MBUS -- cgit v1.2.3 From 9dfb81efbbddf8258ff9c10f9649553608975e02 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 6 Feb 2016 02:36:48 +0900 Subject: ARM: drop unused Makefile.boot of Multiplatform SoCs The variable "MACHINE" is empty if CONFIG_ARCH_MULTIPLATFORM=y, so these Makefile.boot files are never included. Signed-off-by: Masahiro Yamada Acked-by: Michal Simek (for Zynq) Acked-by: Tony Lindgren Signed-off-by: Olof Johansson --- arch/arm/mach-mv78xx0/Makefile.boot | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 arch/arm/mach-mv78xx0/Makefile.boot (limited to 'arch/arm/mach-mv78xx0') diff --git a/arch/arm/mach-mv78xx0/Makefile.boot b/arch/arm/mach-mv78xx0/Makefile.boot deleted file mode 100644 index 760a0efe7580..000000000000 --- a/arch/arm/mach-mv78xx0/Makefile.boot +++ /dev/null @@ -1,3 +0,0 @@ - zreladdr-y += 0x00008000 -params_phys-y := 0x00000100 -initrd_phys-y := 0x00800000 -- cgit v1.2.3