]> git.sur5r.net Git - u-boot/commitdiff
avr32: fix relocation address calculation
authorAndreas Bießmann <andreas.devel@googlemail.com>
Tue, 7 May 2013 23:25:17 +0000 (23:25 +0000)
committerAndreas Bießmann <andreas.devel@googlemail.com>
Mon, 13 May 2013 08:35:12 +0000 (10:35 +0200)
Commit 1865286466a5d0c7f2e3c37632da56556c838e9e (Introduce generic link
section.h symbol files) changed the __bss_end symbol type from char[] to
ulong. This led to wrong relocation parameters which ended up in a not working
u-boot. Unfortunately this is not clear to see cause due to RAM aliasing we
may get a 'half-working' u-boot then.

Fix this by dereferencing the __bss_end symbol where needed.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
arch/avr32/lib/board.c

index ccf862a7fbf2ca3d88b96375e1392eefbca5fe22..2e79e98eb0d2ec843dc0ba3357410ab4a0936ed4 100644 (file)
@@ -116,7 +116,7 @@ static int display_banner (void)
        printf ("\n\n%s\n\n", version_string);
        printf ("U-Boot code: %08lx -> %08lx  data: %08lx -> %08lx\n",
                (unsigned long)_text, (unsigned long)_etext,
-               (unsigned long)_data, (unsigned long)__bss_end);
+               (unsigned long)_data, (unsigned long)(&__bss_end));
        return 0;
 }
 
@@ -183,7 +183,7 @@ void board_init_f(ulong board_type)
         *  - stack
         */
        addr = CONFIG_SYS_SDRAM_BASE + sdram_size;
-       monitor_len = (char *)__bss_end - _text;
+       monitor_len = (char *)(&__bss_end) - _text;
 
        /*
         * Reserve memory for u-boot code, data and bss.