[PATCH 12/15] ARM: drop non PBL support

[Sascha Hauer]

All ARM boards now use PBL, so remove unused code inside #ifdef
CONFIG_PBL_IMAGE.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/Kconfig             |  1 -
 arch/arm/cpu/entry_ll_32.S   |  4 ----
 arch/arm/cpu/entry_ll_64.S   |  4 ----
 arch/arm/cpu/start.c         | 17 -----------------
 arch/arm/lib32/barebox.lds.S |  3 ---
 arch/arm/lib64/barebox.lds.S |  3 ---
 6 files changed, 32 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e2ea68e762..9acda8d929 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -123,7 +123,6 @@ config ARCH_ZYNQ
 	bool "Xilinx Zynq-based boards"
 	depends on 32BIT
 	select HAS_DEBUG_LL
-	select PBL_IMAGE
 	select GPIOLIB
 
 endchoice
diff --git a/arch/arm/cpu/entry_ll_32.S b/arch/arm/cpu/entry_ll_32.S
index 2800174c45..0d4c47c1c8 100644
--- a/arch/arm/cpu/entry_ll_32.S
+++ b/arch/arm/cpu/entry_ll_32.S
@@ -19,9 +19,5 @@ ENTRY(__barebox_arm_entry)
 	mov	r0, r4
 	mov	r1, r5
 	mov	r2, r6
-#if IS_ENABLED(CONFIG_PBL_IMAGE)
 	b	barebox_pbl_start
-#else
-	b	barebox_non_pbl_start
-#endif
 ENDPROC(__barebox_arm_entry)
diff --git a/arch/arm/cpu/entry_ll_64.S b/arch/arm/cpu/entry_ll_64.S
index 6530bec5eb..5eb6efed5b 100644
--- a/arch/arm/cpu/entry_ll_64.S
+++ b/arch/arm/cpu/entry_ll_64.S
@@ -19,9 +19,5 @@ ENTRY(__barebox_arm_entry)
 	mov	x0, x19
 	mov	x1, x20
 	mov	x2, x21
-#if IS_ENABLED(CONFIG_PBL_IMAGE)
 	b	barebox_pbl_start
-#else
-	b	barebox_non_pbl_start
-#endif
 ENDPROC(__barebox_arm_entry)
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index 0351dcb927..cc5529eef5 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -224,11 +224,6 @@ __noreturn __prereloc void barebox_non_pbl_start(unsigned long membase,
 
 	mem_malloc_init((void *)malloc_start, (void *)malloc_end - 1);
 
-	if (IS_ENABLED(CONFIG_MMU) && !IS_ENABLED(CONFIG_PBL_IMAGE)) {
-		arm_early_mmu_cache_invalidate();
-		mmu_early_enable(membase, memsize);
-	}
-
 	if (IS_ENABLED(CONFIG_BOOTM_OPTEE))
 		of_add_reserve_entry(endmem - OPTEE_SIZE, endmem - 1);
 
@@ -237,17 +232,6 @@ __noreturn __prereloc void barebox_non_pbl_start(unsigned long membase,
 	start_barebox();
 }
 
-#ifndef CONFIG_PBL_IMAGE
-
-void start(void);
-
-void NAKED __section(.text_entry) start(void)
-{
-	barebox_arm_head();
-}
-
-#else
-
 void start(unsigned long membase, unsigned long memsize, void *boarddata);
 /*
  * First function in the uncompressed image. We get here from
@@ -258,4 +242,3 @@ void NAKED __prereloc __section(.text_entry) start(unsigned long membase,
 {
 	barebox_non_pbl_start(membase, memsize, boarddata);
 }
-#endif
diff --git a/arch/arm/lib32/barebox.lds.S b/arch/arm/lib32/barebox.lds.S
index ec145569be..90be773840 100644
--- a/arch/arm/lib32/barebox.lds.S
+++ b/arch/arm/lib32/barebox.lds.S
@@ -16,9 +16,6 @@ SECTIONS
 #endif
 	.image_start : { *(.__image_start) }
 
-#ifndef CONFIG_PBL_IMAGE
-	PRE_IMAGE
-#endif
 	. = ALIGN(4);
 
 	._text : { *(._text) }
diff --git a/arch/arm/lib64/barebox.lds.S b/arch/arm/lib64/barebox.lds.S
index de777ddb54..a05340ad48 100644
--- a/arch/arm/lib64/barebox.lds.S
+++ b/arch/arm/lib64/barebox.lds.S
@@ -16,9 +16,6 @@ SECTIONS
 
 	.image_start : { *(.__image_start) }
 
-#ifndef CONFIG_PBL_IMAGE
-	PRE_IMAGE
-#endif
 	. = ALIGN(4);
 	._text : { *(._text) }
 	.text      :
-- 
2.39.2