[PATCH 11/15] ARM: move HAVE_PBL_MULTI_IMAGES to toplevel

[Sascha Hauer]

All ARM architectures now have PBL multi image support, so move
HAVE_PBL_MULTI_IMAGES and HAVE_PBL_IMAGE to the toplevel ARM
config.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/Kconfig              |  9 ++-------
 arch/arm/cpu/Kconfig          |  3 ---
 arch/arm/cpu/uncompress.c     | 13 -------------
 arch/arm/mach-omap/Kconfig    |  1 -
 arch/arm/mach-socfpga/Kconfig |  2 --
 arch/arm/mach-zynq/Kconfig    |  1 -
 6 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5a10b5aaa3..e2ea68e762 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -10,6 +10,8 @@ config ARM
 	select ARCH_HAS_SJLJ
 	select ARM_OPTIMZED_STRING_FUNCTIONS if KASAN
 	select HAVE_EFI_STUB
+	select HAVE_PBL_IMAGE
+	select HAVE_PBL_MULTI_IMAGES
 	default y
 
 config ARM_LINUX
@@ -42,7 +44,6 @@ choice
 	prompt "ARM system type"
 
 config ARCH_MULTIARCH
-	select HAVE_PBL_MULTI_IMAGES
 	select OFTREE
 	select OFDEVICE
 	bool "Allow multiple archs to be selected"
@@ -52,7 +53,6 @@ config ARCH_AT91
 	depends on 32BIT
 	select GPIOLIB
 	select CLKDEV_LOOKUP
-	select HAVE_PBL_MULTI_IMAGES
 	select HAS_DEBUG_LL
 	select HAVE_CLK
 	select COMMON_CLK_AT91 if COMMON_CLK_OF_PROVIDER
@@ -66,7 +66,6 @@ config ARCH_CLPS711X
 	select CPU_32v4T
 	select GPIOLIB
 	select HAS_DEBUG_LL
-	select HAVE_PBL_MULTI_IMAGES
 	select MFD_SYSCON
 	select RELOCATABLE
 
@@ -77,7 +76,6 @@ config ARCH_MVEBU
 	select COMMON_CLK_OF_PROVIDER
 	select GPIOLIB
 	select HAS_DEBUG_LL
-	select HAVE_PBL_MULTI_IMAGES
 	select HW_HAS_PCI
 	select MVEBU_MBUS
 	select OFTREE
@@ -91,7 +89,6 @@ config ARCH_MXS
 	select GENERIC_GPIO
 	select COMMON_CLK
 	select HAS_DEBUG_LL
-	select HAVE_PBL_MULTI_IMAGES
 
 config ARCH_PXA
 	bool "Intel/Marvell PXA based"
@@ -116,7 +113,6 @@ config ARCH_TEGRA
 	select COMMON_CLK_OF_PROVIDER
 	select GPIOLIB
 	select GPIO_TEGRA
-	select HAVE_PBL_MULTI_IMAGES
 	select OFDEVICE
 	select OFTREE
 	select RELOCATABLE
@@ -277,7 +273,6 @@ config BOARD_ARM_VIRT
 config BOARD_ARM_GENERIC_DT
 	select BOARD_GENERIC_DT
 	select ARM_AMBA
-	depends on HAVE_PBL_MULTI_IMAGES
 	depends on OFDEVICE
 	bool "Build generic ARM device tree 2nd stage image"
 	help
diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig
index e69acaacdf..6563394a7a 100644
--- a/arch/arm/cpu/Kconfig
+++ b/arch/arm/cpu/Kconfig
@@ -10,14 +10,11 @@ config CPU_32
 	select HAS_MODULES
 	select HAVE_MOD_ARCH_SPECIFIC
 	select HAS_DMA
-	select HAVE_PBL_IMAGE
 	select ARCH_HAS_ZERO_PAGE
 
 config CPU_64
 	bool
 	select PHYS_ADDR_T_64BIT
-	select HAVE_PBL_IMAGE
-	select HAVE_PBL_MULTI_IMAGES
 	select HAS_DMA
 	select ARCH_WANT_FRAME_POINTERS
 	select ARCH_HAS_ZERO_PAGE
diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c
index a481c4634d..4101cb36a4 100644
--- a/arch/arm/cpu/uncompress.c
+++ b/arch/arm/cpu/uncompress.c
@@ -23,19 +23,6 @@
 
 #include "entry.h"
 
-#ifndef CONFIG_HAVE_PBL_MULTI_IMAGES
-
-void start_pbl(void);
-
-/*
- * First instructions in the pbl image
- */
-void __naked __section(.text_head_entry_start_single_pbl) start_pbl(void)
-{
-	barebox_arm_head();
-}
-#endif
-
 unsigned long free_mem_ptr;
 unsigned long free_mem_end_ptr;
 
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index fe3c6316dc..6ddbb6e572 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -182,7 +182,6 @@ config MACH_VSCOM_BALTOS
 config MACH_WAGO_PFC_AM35XX
         bool "Wago PFC200 Fieldbus Controller"
         select ARCH_AM35XX
-        select HAVE_PBL_MULTI_IMAGES
         select HAVE_CONFIGURABLE_MEMORY_LAYOUT
         help
           Say Y here if you are using a the AM3505 based PFC200 controller
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index b23a41d3f9..75f03d3f6a 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -15,7 +15,6 @@ comment "Altera SoCFPGA System-on-Chip"
 config ARCH_SOCFPGA_CYCLONE5
 	bool
 	select CPU_V7
-	select HAVE_PBL_MULTI_IMAGES
 	select OFDEVICE if !ARCH_SOCFPGA_XLOAD
 	select OFTREE if !ARCH_SOCFPGA_XLOAD
 	select GPIOLIB if !ARCH_SOCFPGA_XLOAD
@@ -25,7 +24,6 @@ config ARCH_SOCFPGA_ARRIA10
 	select CPU_V7
 	select ARM_USE_COMPRESSED_DTB
 	select RESET_CONTROLLER
-	select HAVE_PBL_MULTI_IMAGES
 	select OFDEVICE
 	select OFTREE
 
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 451a344b2e..be51411a43 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -17,7 +17,6 @@ config ARCH_ZYNQ7000
 	select COMMON_CLK_OF_PROVIDER
 	select ARM_SMP_TWD
 	select HAS_MACB
-	select HAVE_PBL_MULTI_IMAGES
 	select OFTREE
 	select OFDEVICE
 	select RELOCATABLE
-- 
2.39.2