mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 1/6] ARM: remove PBL_FORCE_PIGGYDATA_COPY
Date: Mon, 16 Sep 2019 09:27:16 +0200	[thread overview]
Message-ID: <20190916072721.12392-2-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20190916072721.12392-1-s.hauer@pengutronix.de>

This option is unused in the tree, remove it for now. If you need this
option, let me know, we'll find another solution.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/cpu/start-pbl.c | 13 -------------
 pbl/Kconfig              |  8 --------
 2 files changed, 21 deletions(-)

diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c
index 796239d902..0006f40d55 100644
--- a/arch/arm/cpu/start-pbl.c
+++ b/arch/arm/cpu/start-pbl.c
@@ -52,7 +52,6 @@ extern void *input_data_end;
 __noreturn void barebox_single_pbl_start(unsigned long membase,
 		unsigned long memsize, void *boarddata)
 {
-	unsigned long offset;
 	unsigned long pg_start, pg_end, pg_len, uncompressed_len;
 	void __noreturn (*barebox)(unsigned long, unsigned long, void *);
 	unsigned long endmem = membase + memsize;
@@ -61,9 +60,6 @@ __noreturn void barebox_single_pbl_start(unsigned long membase,
 	if (IS_ENABLED(CONFIG_PBL_RELOCATABLE))
 		relocate_to_current_adr();
 
-	/* Get offset between linked address and runtime address */
-	offset = get_runtime_offset();
-
 	pg_start = (unsigned long)&input_data + global_variable_offset();
 	pg_end = (unsigned long)&input_data_end + global_variable_offset();
 	pg_len = pg_end - pg_start;
@@ -74,15 +70,6 @@ __noreturn void barebox_single_pbl_start(unsigned long membase,
 	else
 		barebox_base = TEXT_BASE;
 
-	if (offset && (IS_ENABLED(CONFIG_PBL_FORCE_PIGGYDATA_COPY) ||
-				region_overlap(pg_start, pg_len, barebox_base, pg_len * 4))) {
-		/*
-		 * copy piggydata binary to its link address
-		 */
-		memcpy(&input_data, (void *)pg_start, pg_len);
-		pg_start = (uint32_t)&input_data;
-	}
-
 	setup_c();
 
 	if (IS_ENABLED(CONFIG_MMU_EARLY)) {
diff --git a/pbl/Kconfig b/pbl/Kconfig
index 7e6077f96d..6e8cc3ac04 100644
--- a/pbl/Kconfig
+++ b/pbl/Kconfig
@@ -24,14 +24,6 @@ config PBL_SINGLE_IMAGE
 	depends on !HAVE_PBL_MULTI_IMAGES
 	default y
 
-config PBL_FORCE_PIGGYDATA_COPY
-	bool
-	help
-	  In some case we need to copy the PIGGYDATA as the link address
-	  as example we run from SRAM and shutdown the SDRAM/DDR for
-	  reconfiguration but most of the time we just need to copy the
-	  executable code.
-
 if PBL_IMAGE
 
 config PBL_RELOCATABLE
-- 
2.23.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2019-09-16  7:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-16  7:27 [PATCH 0/6] ARM: Merge single PBL code into multi PBL code Sascha Hauer
2019-09-16  7:27 ` Sascha Hauer [this message]
2019-09-16  7:27 ` [PATCH 2/6] ARM: Compile dtbs for lowlevel code Sascha Hauer
2019-09-16  7:27 ` [PATCH 3/6] ARM: drop bultin DTB Sascha Hauer
2019-09-16  7:27 ` [PATCH 4/6] ARM: Merge single pbl with multi pbl Sascha Hauer
2019-09-16  7:27 ` [PATCH 5/6] ARM: remove now unused PBL code Sascha Hauer
2019-09-16  7:27 ` [PATCH 6/6] ARM: aarch64: Re-implement most of barebox_arm_entry() in assembly 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=20190916072721.12392-2-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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