Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / board / cssi / MCR3000 / u-boot.lds

diff --git a/board/cssi/MCR3000/u-boot.lds b/board/cssi/MCR3000/u-boot.lds
index cd042ca..70aef32 100644 (file)
--- a/board/cssi/MCR3000/u-boot.lds
+++ b/board/cssi/MCR3000/u-boot.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2010-2017 CS Systemes d'Information
  * Christophe Leroy <christophe.leroy@c-s.fr>
@@ -6,8 +7,6 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * Modified by Yuli Barcohen <yuli@arabellasw.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 OUTPUT_ARCH(powerpc)
@@ -18,14 +17,13 @@ SECTIONS
        .text          :
        {
                arch/powerpc/cpu/mpc8xx/start.o (.text)
-               arch/powerpc/cpu/mpc8xx/start.o (.text*)
                arch/powerpc/cpu/mpc8xx/traps.o (.text*)
-               arch/powerpc/cpu/mpc8xx/built-in.o      (.text*)
                arch/powerpc/lib/built-in.o             (.text*)
-               board/cssi/MCR3000/built-in.o   (.text*)
-               disk/built-in.o                 (.text*)
                drivers/net/built-in.o          (.text*)
 
+               . = DEFINED(env_offset) ? env_offset : .;
+               env/embedded.o                  (.text.environment)
+
                *(.text)
        }
        _etext = .;
@@ -70,6 +68,12 @@ SECTIONS
        __ex_table : { *(__ex_table) }
        __stop___ex_table = .;
 
+       /*
+        * _end - This is end of u-boot.bin image.
+        * dtb will be appended here to make u-boot-dtb.bin
+        */
+       _end = .;
+
        . = ALIGN(4096);
        __init_begin = .;
        .text.init : { *(.text.init) }