From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Cc: Jan Weitzel <j.weitzel@phytec.de>,
Vicente Bergas <vicencb@gmail.com>,
Bo Shen <voice.shen@atmel.com>,
Matthias Kaehlcke <matthias@kaehlcke.net>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Subject: [PATCH 12/15] ARM: drop non PBL support
Date: Thu, 25 Apr 2024 13:54:36 +0200 [thread overview]
Message-ID: <20240425115439.2269239-13-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20240425115439.2269239-1-s.hauer@pengutronix.de>
All ARM boards now use PBL, so remove unused code inside #ifdef
CONFIG_PBL_IMAGE.
Signed-off-by: Sascha Hauer <s.hauer@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
next prev parent reply other threads:[~2024-04-25 12:11 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 11:54 [PATCH 00/15] ARM: remove non PBL ARM boards and sub architectures Sascha Hauer
2024-04-25 11:54 ` [PATCH 01/15] ARM: move HAVE_PBL_MULTI_IMAGES up to ARCH_MULTIARCH Sascha Hauer
2024-04-25 11:54 ` [PATCH 02/15] ARM: move OFTREE and OFDEVICE up one level Sascha Hauer
2024-04-25 11:54 ` [PATCH 03/15] ARM: remove uemd architecure Sascha Hauer
2024-04-25 11:54 ` [PATCH 04/15] ARM: remove ep93xx Sascha Hauer
2024-04-25 11:54 ` [PATCH 05/15] ARM: remove canon-a1100 support Sascha Hauer
2024-04-25 11:54 ` [PATCH 06/15] ARM: remove davinci Sascha Hauer
2024-04-25 11:54 ` [PATCH 07/15] ARM: remove PXA boards Sascha Hauer
2024-04-25 11:54 ` [PATCH 08/15] ARM: remove nomadik Sascha Hauer
2024-04-25 11:54 ` [PATCH 09/15] ARM: remove non PBL OMAP boards Sascha Hauer
2024-04-25 11:54 ` [PATCH 10/15] ARM: remove non PBL Atmel boards Sascha Hauer
2024-04-25 16:56 ` Sam Ravnborg
2024-04-26 10:59 ` Sascha Hauer
2024-04-26 11:49 ` Sam Ravnborg
2024-04-25 11:54 ` [PATCH 11/15] ARM: move HAVE_PBL_MULTI_IMAGES to toplevel Sascha Hauer
2024-04-25 11:54 ` Sascha Hauer [this message]
2024-04-25 11:54 ` [PATCH 13/15] ARM: drop barebox_arm_head() Sascha Hauer
2024-04-25 11:54 ` [PATCH 14/15] ARM: make relocatable mandatory Sascha Hauer
2024-04-25 11:54 ` [PATCH 15/15] ARM: drop TEXT_BASE Sascha Hauer
2024-04-30 5:44 ` [PATCH 00/15] ARM: remove non PBL ARM boards and sub architectures Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425115439.2269239-13-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=j.weitzel@phytec.de \
--cc=matthias@kaehlcke.net \
--cc=plagnioj@jcrosoft.com \
--cc=vicencb@gmail.com \
--cc=voice.shen@atmel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox