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

[karo-tx-uboot.git] / board / spd8xx / u-boot.lds

diff --git a/board/spd8xx/u-boot.lds b/board/spd8xx/u-boot.lds
index 950e1e6e2cb8af441c37015cab6392fc794ef77d..463af7eaa4c57b7731a9cd2cd79b4e48d1a3ef3b 100644 (file)
--- a/board/spd8xx/u-boot.lds
+++ b/board/spd8xx/u-boot.lds
@@ -2,23 +2,7 @@
  * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software 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+
  */
 
 OUTPUT_ARCH(powerpc)
@@ -34,9 +18,8 @@ SECTIONS
 
     arch/powerpc/cpu/mpc8xx/start.o    (.text*)
     arch/powerpc/cpu/mpc8xx/traps.o    (.text*)
-    net/libnet.o                       (.text*)
-    arch/powerpc/cpu/mpc8xx/libmpc8xx.o        (.text*)
-    board/spd8xx/libspd8xx.o           (.text*)
+    net/built-in.o                     (.text*)
+    arch/powerpc/cpu/mpc8xx/built-in.o (.text*)
     *(.text.v*printf)
 
     . = DEFINED(env_offset) ? env_offset : .;
@@ -76,9 +59,11 @@ SECTIONS
   PROVIDE (edata = .);
 
   . = .;
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
+
+  . = ALIGN(4);
+  .u_boot_list : {
+       KEEP(*(SORT(.u_boot_list*)));
+  }
 
 
   . = .;
@@ -101,6 +86,6 @@ SECTIONS
    *(COMMON)
    . = ALIGN(4);
   }
-  __bss_end__ = . ;
+  __bss_end = . ;
   PROVIDE (end = .);
 }