summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-09-09 12:43:47 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-09-23 08:49:08 +0200
commit070de908da26d7c1b2a29749be313d2b386f3645 (patch)
tree7f9f6791d881fcf06ed933eeeba183237f753f7d
parent05546e8d02c8ed243703f1fd54f4d29ed6736620 (diff)
downloadbarebox-070de908da26d7c1b2a29749be313d2b386f3645.tar.gz
ARM: remove PBL_FORCE_PIGGYDATA_COPY
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>
-rw-r--r--arch/arm/cpu/start-pbl.c13
-rw-r--r--pbl/Kconfig8
2 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c
index 796239d..0006f40 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 7e6077f..6e8cc3a 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