path: root/arch/nios2
diff options
authorTom Rini <>2013-03-18 12:31:00 -0400
committerTom Rini <>2013-03-18 14:37:18 -0400
commit0ce033d2582129243aca10d3072a221386bbba44 (patch)
tree6e50a3f4eed22007549dc740d0fa647a6c8cec5b /arch/nios2
parentb5bec88434adb52413f1bc33fa63d7642cb8fd35 (diff)
parentb27673ccbd3d5435319b5c09c3e7061f559f925d (diff)
Merge branch 'master' of git://
Albert's rework of the linker scripts conflicted with Simon's making everyone use __bss_end. We also had a minor conflict over README.scrapyard being added to in mainline and enhanced in u-boot-arm/master with proper formatting. Conflicts: arch/arm/cpu/ixp/ arch/arm/cpu/ arch/arm/lib/Makefile board/actux1/ board/actux2/ board/actux3/ board/dvlhost/ board/freescale/mx31ads/ doc/README.scrapyard include/configs/tegra-common.h Build tested for all of ARM and run-time tested on am335x_evm. Signed-off-by: Tom Rini <>
Diffstat (limited to 'arch/nios2')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nios2/cpu/ b/arch/nios2/cpu/
index 90a7795746..4c45336d4a 100644
--- a/arch/nios2/cpu/
+++ b/arch/nios2/cpu/
@@ -48,7 +48,7 @@ SECTIONS
. = ALIGN(4);
.u_boot_list : {
- #include <u-boot.lst>
+ KEEP(*(SORT(.u_boot_list*)));
/* INIT DATA sections - "Small" data (see the gcc -G option)
OpenPOWER on IntegriCloud