Merge tag 'efi-2019-07-rc5-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / arch / arm / cpu / armv8 / u-boot-spl.lds

diff --git a/arch/arm/cpu/armv8/u-boot-spl.lds b/arch/arm/cpu/armv8/u-boot-spl.lds
index 4df339c84abbb9d4c3e3a9db2b515747a7f0654a..ccbf359bd11d7951d37f589787caa21a877b03f8 100644 (file)
--- a/arch/arm/cpu/armv8/u-boot-spl.lds
+++ b/arch/arm/cpu/armv8/u-boot-spl.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2013
  * David Feng <fenghua@phytium.com.cn>
@@ -8,12 +9,10 @@
  * (C) Copyright 2010
  * Texas Instruments, <www.ti.com>
  *     Aneesh V <aneesh@ti.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE,
-               LENGTH = CONFIG_SPL_MAX_SIZE }
+MEMORY { .sram : ORIGIN = IMAGE_TEXT_BASE,
+               LENGTH = IMAGE_MAX_SIZE }
 MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR,
                LENGTH = CONFIG_SPL_BSS_MAX_SIZE }
 
@@ -54,17 +53,19 @@ SECTIONS
                *(.__end)
        } >.sram
 
-       .bss_start : {
+       _image_binary_end = .;
+
+       .bss_start (NOLOAD) : {
                . = ALIGN(8);
                KEEP(*(.__bss_start));
        } >.sdram
 
-       .bss : {
+       .bss (NOLOAD) : {
                *(.bss*)
                 . = ALIGN(8);
        } >.sdram
 
-       .bss_end : {
+       .bss_end (NOLOAD) : {
                KEEP(*(.__bss_end));
        } >.sdram