Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / arch / microblaze / cpu / u-boot.lds

diff --git a/arch/microblaze/cpu/u-boot.lds b/arch/microblaze/cpu/u-boot.lds
index fe3d97d..5dc09db 100644 (file)
--- a/arch/microblaze/cpu/u-boot.lds
+++ b/arch/microblaze/cpu/u-boot.lds
@@ -1,25 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2004 Atmark Techno, Inc.
  *
  * Yasushi SHOJI <yashi@atmark-techno.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
  */
 
 OUTPUT_ARCH(microblaze)
@@ -31,7 +14,7 @@ SECTIONS
        {
                __text_start = .;
                arch/microblaze/cpu/start.o (.text)
-               *(.text)
+               *(.text*)
                __text_end = .;
        }
 
@@ -45,24 +28,30 @@ SECTIONS
        .data ALIGN(0x4):
        {
                __data_start = .;
-#ifdef CONFIG_OF_EMBED
-               dts/libdts.o (.data)
-#endif
-               *(.data)
+               *(.data*)
                __data_end = .;
        }
 
+       .got ALIGN(4):
+       {
+               _got_start = .;
+               *(.got*)
+               . = ALIGN(4);
+               _got_end = .;
+       }
+
        . = ALIGN(4);
        .u_boot_list : {
-               #include <u-boot.lst>
+               KEEP(*(SORT(.u_boot_list*)));
        }
+       __init_end = . ;
 
        .bss ALIGN(0x4):
        {
                __bss_start = .;
                *(.sbss)
                *(.scommon)
-               *(.bss)
+               *(.bss*)
                *(COMMON)
                . = ALIGN(4);
                __bss_end = .;