Merge with /home/wd/git/u-boot/master

[u-boot] / board / sc520_cdp / sc520_cdp_asm16.S

diff --git a/board/sc520_cdp/sc520_cdp_asm16.S b/board/sc520_cdp/sc520_cdp_asm16.S
index a3cadcfa547e1ebde023dbaa14b87759e8035149..a3e700a6263c2214b6b3e35a935a8dc49fdfc758 100644 (file)
--- a/board/sc520_cdp/sc520_cdp_asm16.S
+++ b/board/sc520_cdp/sc520_cdp_asm16.S
@@ -34,29 +34,50 @@
 board_init16:
        /* Alias MMCR to 0xdf000 */
        movw    $0xfffc, %dx
-       movl    $0x800df0cb, %eax       
-       outl    %eax, %dx               
-       
+       movl    $0x800df0cb, %eax
+       outl    %eax, %dx
+
        /* Set ds to point to MMCR alias */
-       movw    $0xdf00, %ax            
-       movw    %ax, %ds                 
-               
-       /* Map the entire flash at 0x38000000  
+       movw    $0xdf00, %ax
+       movw    %ax, %ds
+
+       /* Map the entire flash at 0x38000000
         * (with BOOTCS and PAR14, use 0xabfff800 for ROMCS1) */
        movl    $0xc0, %edi
-        movl   $0x8bfff800, %eax
-        movl   %eax, (%di)             
+       movl    $0x8bfff800, %eax
+       movl    %eax, (%di)
 
        /* Disable SDRAM write buffer */
        movw    $0x40,%di
-        xorw    %ax,%ax
-        movb    %al, (%di)              
+       xorw    %ax,%ax
+       movb    %al, (%di)
 
        /* Disabe MMCR alias */
        movw    $0xfffc, %dx
-       movl    $0x000000cb, %eax       
-       outl    %eax, %dx               
-       
+       movl    $0x000000cb, %eax
+       outl    %eax, %dx
+
        /* the return address is tored in bp */
        jmp     *%bp
-       
+
+
+.section .bios, "ax"
+.code16
+.globl realmode_reset
+realmode_reset:
+       /* Alias MMCR to 0xdf000 */
+       movw    $0xfffc, %dx
+       movl    $0x800df0cb, %eax
+       outl    %eax, %dx
+
+       /* Set ds to point to MMCR alias */
+       movw    $0xdf00, %ax
+       movw    %ax, %ds
+
+       /* issue software reset thorugh MMCR */
+       movl    $0xd72, %edi
+       movb    $0x01, %al
+       movb    %al, (%di)
+
+1:     hlt
+       jmp     1