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

[u-boot] / arch / nios2 / cpu / u-boot.lds

diff --git a/arch/nios2/cpu/u-boot.lds b/arch/nios2/cpu/u-boot.lds
index f937396233edadf16a5eec49170fbff15fdb6c77..4c45336d4ae40536f06dbde3e01cdc40d01b5c85 100644 (file)
--- a/arch/nios2/cpu/u-boot.lds
+++ b/arch/nios2/cpu/u-boot.lds
@@ -101,7 +101,7 @@ SECTIONS
          *(.scommon)
        }
        . = ALIGN(4);
-       __bss_end__ = .;
+       __bss_end = .;
        PROVIDE (end = .);
 
        /* DEBUG -- symbol table, string table, etc. etc.