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

[oweals/u-boot.git] / arch / mips / cpu / u-boot.lds

diff --git a/arch/mips/cpu/u-boot.lds b/arch/mips/cpu/u-boot.lds
index 4cd983ae4f20865bb4f473eadcc40dace9190e1a..7d71c11ae4c6cfa5ff1aa22df51a20d4ceb16bc0 100644 (file)
--- a/arch/mips/cpu/u-boot.lds
+++ b/arch/mips/cpu/u-boot.lds
@@ -2,23 +2,7 @@
  * (C) Copyright 2003
  * Wolfgang Denk Engineering, <wd@denx.de>
  *
- * 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+
  */
 
 #if defined(CONFIG_64BIT)
@@ -64,13 +48,40 @@ SECTIONS
 
        . = ALIGN(4);
        .u_boot_list : {
-               #include <u-boot.lst>
+               KEEP(*(SORT(.u_boot_list*)));
        }
 
        . = ALIGN(4);
        __image_copy_end = .;
+       __init_end = .;
+
+       .rel.dyn : {
+               __rel_dyn_start = .;
+               *(.rel.dyn)
+               __rel_dyn_end = .;
+       }
+
+       .padding : {
+               /*
+                * Workaround for a binutils feature (or bug?).
+                *
+                * The GNU ld from binutils puts the dynamic relocation
+                * entries into the .rel.dyn section. Sometimes it
+                * allocates more dynamic relocation entries than it needs
+                * and the unused slots are set to R_MIPS_NONE entries.
+                *
+                * However the size of the .rel.dyn section in the ELF
+                * section header does not cover the unused entries, so
+                * objcopy removes those during stripping.
+                *
+                * Create a small section here to avoid that.
+                */
+               LONG(0xFFFFFFFF)
+       }
 
-       .bss : {
+       _end = .;
+
+       .bss __rel_dyn_start (OVERLAY) : {
                __bss_start = .;
                *(.sbss.*)
                *(.bss.*)
@@ -78,4 +89,40 @@ SECTIONS
                . = ALIGN(4);
                __bss_end = .;
        }
+
+       .dynsym _end : {
+               *(.dynsym)
+       }
+
+       .dynbss : {
+               *(.dynbss)
+       }
+
+       .dynstr : {
+               *(.dynstr)
+       }
+
+       .dynamic : {
+               *(.dynamic)
+       }
+
+       .plt : {
+               *(.plt)
+       }
+
+       .interp : {
+               *(.interp)
+       }
+
+       .gnu : {
+               *(.gnu*)
+       }
+
+       .MIPS.stubs : {
+               *(.MIPS.stubs)
+       }
+
+       .hash : {
+               *(.hash)
+       }
 }