Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / nand_spl / board / freescale / mpc8315erdb / u-boot.lds

diff --git a/nand_spl/board/freescale/mpc8315erdb/u-boot.lds b/nand_spl/board/freescale/mpc8315erdb/u-boot.lds
index ad8258957bb81a89c3e0d179415b413bab900494..870b47d6af4ab910e60f6ea407c19a2260c4e4ef 100644 (file)
--- a/nand_spl/board/freescale/mpc8315erdb/u-boot.lds
+++ b/nand_spl/board/freescale/mpc8315erdb/u-boot.lds
@@ -30,7 +30,6 @@ SECTIONS
        .text : {
                *(.text*)
                . = ALIGN(16);
-               *(.eh_frame)
                *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
        }
 
@@ -39,14 +38,18 @@ SECTIONS
                *(.data*)
                *(.sdata*)
                _GOT2_TABLE_ = .;
-               *(.got2)
-               __got2_entries = (. - _GOT2_TABLE_) >> 2;
+               KEEP(*(.got2))
+               KEEP(*(.got))
+               PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
        }
+       __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
 
        . = ALIGN(8);
        __bss_start = .;
-       .bss (NOLOAD) : { *(.*bss) }
-       _end = .;
+       .bss (NOLOAD) : {
+               *(.*bss)
+       }
+       __bss_end = .;
 }
 ENTRY(_start)
-ASSERT(_end <= 0xfff01000, "NAND bootstrap too big");
+ASSERT(__bss_end <= 0xfff01000, "NAND bootstrap too big");