Merge tag 'u-boot-amlogic-20190129' of git://git.denx.de/u-boot-amlogic

[oweals/u-boot.git] / board / samsung / common / exynos-uboot-spl.lds

diff --git a/board/samsung/common/exynos-uboot-spl.lds b/board/samsung/common/exynos-uboot-spl.lds
index 8e3b73ecf7859ede269071727a2c39d6e73af459..5b32f7feb817ee8ff44d222610016f693477a123 100644 (file)
--- a/board/samsung/common/exynos-uboot-spl.lds
+++ b/board/samsung/common/exynos-uboot-spl.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2002
  * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
@@ -5,11 +6,9 @@
  * Copyright (C) 2012 Samsung Electronics
  *
  * Based on arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE, \
+MEMORY { .sram : ORIGIN = IMAGE_TEXT_BASE, \
                LENGTH = CONFIG_SPL_MAX_FOOTPRINT }
 
 OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
@@ -21,6 +20,7 @@ SECTIONS
        .text :
        {
                __start = .;
+               *(.vectors)
                arch/arm/cpu/armv7/start.o (.text*)
                *(.text*)
        } >.sram
@@ -37,12 +37,15 @@ SECTIONS
        } >.sram
        . = ALIGN(4);
 
-       /* Align .machine_param on 256 byte boundary for easier searching */
-       .machine_param ALIGN(0x100) : { *(.machine_param) } >.sram
+       .machine_param : { *(.machine_param) } >.sram
        . = ALIGN(4);
 
        __image_copy_end = .;
-       _end = .;
+
+       .end :
+       {
+               *(.__end)
+       } >.sram
 
        .bss :
        {