Merge branch 'next' of git://git.denx.de/u-boot-mips

[karo-tx-uboot.git] / board / eNET / eNET_start16.S

diff --git a/board/eNET/eNET_start16.S b/board/eNET/eNET_start16.S
index 48e4d83a13825d8f741a3087a0ad3b13d6f05fc3..5e3f44c66436e0d277a01ec0b3794ba65029a025 100644 (file)
--- a/board/eNET/eNET_start16.S
+++ b/board/eNET/eNET_start16.S
@@ -27,9 +27,10 @@
  * that is used by U-boot to its final destination.
  */
 
-/* #include <asm/ic/sc520_defs.h> */
-
+#include "config.h"
 #include "hardware.h"
+#include <asm/arch/sc520.h>
+#include <generated/asm-offsets.h>
 
 .text
 .section .start16, "ax"
@@ -46,31 +47,27 @@ 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    $GENERATED_SC520_PAR14, %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    $GENERATED_SC520_PAR15, %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
 .globl realmode_reset
+.hidden realmode_reset
+.type realmode_reset, @function
 realmode_reset:
        /* Alias MMCR to 0xdf000 */
        movw    $0xfffc, %dx