Merge git://git.denx.de/u-boot-sunxi

[u-boot] / arch / nds32 / cpu / n1213 / u-boot.lds

diff --git a/arch/nds32/cpu/n1213/u-boot.lds b/arch/nds32/cpu/n1213/u-boot.lds
index cef19c51ee5fa2d43837106d8f0908b25ed2f69a..40db0e6e816746bfded3ab95e859722ffec0524c 100644 (file)
--- a/arch/nds32/cpu/n1213/u-boot.lds
+++ b/arch/nds32/cpu/n1213/u-boot.lds
@@ -6,23 +6,7 @@
  * Shawn Lin, Andes Technology Corporation <nobuhiro@andestech.com>
  * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 OUTPUT_FORMAT("elf32-nds32", "elf32-nds32", "elf32-nds32")
@@ -47,26 +31,29 @@ SECTIONS
 
        .got : {
                __got_start = .;
-                *(.got.plt) *(.got)
+               *(.got.plt) *(.got)
                __got_end = .;
        }
 
-       . = .;
-
        . = ALIGN(4);
        .u_boot_list : {
-       #include <u-boot.lst>
+               KEEP(*(SORT(.u_boot_list*)));
        }
 
        . = ALIGN(4);
-
+       /DISCARD/ : { *(.rela.plt*) }
+       .rela.dyn : {
+               __rel_dyn_start = .;
+               *(.rela*)
+               __rel_dyn_end = .;
+ }
        _end = .;
 
        .bss : {
                __bss_start = .;
                *(.bss)
-                . = ALIGN(4);
-               __bss_end__ = .;
+               . = ALIGN(4);
+               __bss_end = .;
        }
 
 }