GCC4.6: Squash error in cpc45/pd67290.c

[u-boot] / board / eNET / eNET_start16.S

diff --git a/board/eNET/eNET_start16.S b/board/eNET/eNET_start16.S
index af2c13215663f62c675fe35b663148e98f51c670..77e5519640da489e37f84e5dcd2ce069538fbf7b 100644 (file)
--- a/board/eNET/eNET_start16.S
+++ b/board/eNET/eNET_start16.S
@@ -29,7 +29,9 @@
 
 /* #include <asm/ic/sc520_defs.h> */
 
+#include "config.h"
 #include "hardware.h"
+#include <asm/ic/sc520.h>
 
 .text
 .section .start16, "ax"
@@ -46,27 +48,21 @@ board_init16:
        movw    %ax, %ds
 
        /* Map PAR for Boot Flash (BOOTCS, 512kB @ 0x380000000) */
-       movl    $0x00c0, %edi           /* SC520_PAR14 */
-       movl    $0x8bfff800, %eax       /* TODO: Check this */
+       movl    $(SC520_PAR14 - SC520_MMCR_BASE), %edi
+       movl    $CONFIG_SYS_SC520_BOOTCS_PAR, %eax
        movl    %eax, (%di)
 
        /* Map PAR for LED, Hex Switches (GPCS6, 20 Bytes @ 0x1000) */
-       movl    $0x00c4, %edi           /* SC520_PAR15 */
-       movl    $0x38201000, %eax
+       movl    $(SC520_PAR15 - SC520_MMCR_BASE), %edi
+       movl    $CONFIG_SYS_SC520_LLIO_PAR, %eax
        movl    %eax, (%di)
 
-       /* Disable SDRAM write buffer */
-       movw    $0x0040, %di            /* SC520_DBCTL */
-       xorw    %ax, %ax
-       movb    %al, (%di)
-
        /* Disabe MMCR alias */
        movw    $0xfffc, %dx
        movl    $0x000000cb, %eax
        outl    %eax, %dx
 
-       /* the return address is stored in bp */
-       jmp     *%bp
+       jmp     board_init16_ret
 
 .section .bios, "ax"
 .code16