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

[u-boot] / arch / avr32 / cpu / start.S

diff --git a/arch/avr32/cpu/start.S b/arch/avr32/cpu/start.S
index 06bf4c692d8e4d848d93d06689bd67a446091242..c8decea127c7b925afa608a586fbe8dd964e9db3 100644 (file)
--- a/arch/avr32/cpu/start.S
+++ b/arch/avr32/cpu/start.S
@@ -19,6 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
+#include <asm-offsets.h>
 #include <config.h>
 #include <asm/ptrace.h>
 #include <asm/sysreg.h>
@@ -243,7 +244,7 @@ relocate_code:
        /* zero out .bss */
        mov     r0, 0
        mov     r1, 0
-       lda.w   r9, _end
+       lda.w   r9, __bss_end
        sub     r9, r8
 1:     st.d    r10++, r0
        sub     r9, 8