Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / arch / sh / cpu / sh4 / u-boot.lds

diff --git a/arch/sh/cpu/sh4/u-boot.lds b/arch/sh/cpu/sh4/u-boot.lds
index 0ecafcf5d94253ff74ab0846bcfee9618b9b85c8..57544ce04010c142dd0fbe7b21a028322dbf2b7d 100644 (file)
--- a/arch/sh/cpu/sh4/u-boot.lds
+++ b/arch/sh/cpu/sh4/u-boot.lds
@@ -5,23 +5,7 @@
  * Copyright (C) 2008-2009
  * Yoshihiro Shimoda <shimoda.yoshihiro@renesas.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-sh-linux", "elf32-sh-linux", "elf32-sh-linux")
@@ -77,7 +61,7 @@ SECTIONS
 
 
        .u_boot_list : {
-               #include <u-boot.lst>
+               KEEP(*(SORT(.u_boot_list*)));
        }
 
        PROVIDE (reloc_dst_end = .);
@@ -92,5 +76,5 @@ SECTIONS
        }
        PROVIDE (bss_end = .);
 
-       PROVIDE (__bss_end__ = .);
+       PROVIDE (__bss_end = .);
 }