X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=DuetPkg%2FBootSector%2Fstart32.S;h=dc683f585b212246cd99a5feabc14e59daa9adf3;hb=a383ca341e7531fab2b3fe2a5bc3294d477aa2fb;hp=c8faf266df95fc2e83eb5ae5efe452f95741a864;hpb=f3eb2131523ba9fccd5ecb69bc2f55a549d30e1a;p=mirror_edk2.git

diff --git a/DuetPkg/BootSector/start32.S b/DuetPkg/BootSector/start32.S
index c8faf266df..dc683f585b 100644
--- a/DuetPkg/BootSector/start32.S
+++ b/DuetPkg/BootSector/start32.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------
 #*
-#*   Copyright 2006 - 2007, Intel Corporation                                                         
-#*   All rights reserved. This program and the accompanying materials                          
+#*   Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+#*   This program and the accompanying materials                          
 #*   are licensed and made available under the terms and conditions of the BSD License         
 #*   which accompanies this distribution.  The full text of the license may be found at        
 #*   http://opensource.org/licenses/bsd-license.php                                            
@@ -18,7 +18,7 @@
         #.MODEL small
         .stack: 
         .486p: 
-        .code: 
+        .code16
 
 .equ                        FAT_DIRECTORY_ENTRY_SIZE, 0x020
 .equ                        FAT_DIRECTORY_ENTRY_SHIFT, 5
@@ -311,11 +311,11 @@ Halt:
 ErrorString: 
         .byte 'S', 0x0c, 'E', 0x0c, 'r', 0x0c, 'r', 0x0c, 'o', 0x0c, 'r', 0x0c, '!', 0x0c
 
-        # .org     0x01fa  # Will cause build break
+        .org     0x01fa
 LBAOffsetForBootSector: 
         .long   0x0
 
-        # .org    0x01fe   # Will cause build break
+        .org    0x01fe
         .word   0xaa55
 
 #******************************************************************************
@@ -328,7 +328,7 @@ LBAOffsetForBootSector:
 .equ                 WRITE_DATA_PORT_CMD, 0x0d1  # 8042 command to write the data port
 .equ                 ENABLE_A20_CMD, 0x0df       # 8042 command to enable A20
 
-# .org     0x200  # Will cause build break
+        .org    0x200
         jmp start
 Em64String: 
         .byte 'E', 0x0c, 'm', 0x0c, '6', 0x0c, '4', 0x0c, 'T', 0x0c, ' ', 0x0c, 'U', 0x0c, 'n', 0x0c, 's', 0x0c, 'u', 0x0c, 'p', 0x0c, 'p', 0x0c, 'o', 0x0c, 'r', 0x0c, 't', 0x0c, 'e', 0x0c, 'd', 0x0c, '!', 0x0c
@@ -413,7 +413,7 @@ Timeout8042:
 
 
 A20GateEnabled: 
-
+        movw    $0x0008, %bx                # Flat data descriptor
 #
 # DISABLE INTERRUPTS - Entering Protected Mode
 #
@@ -434,11 +434,6 @@ A20GateEnabled:
         movl    %cr0, %eax
         orb     $1, %al
         movl    %eax, %cr0
-
-        movl $0x008, %eax                   # Flat data descriptor
-        movl $0x00400000, %ebp              # Destination of EFILDR32
-        movl $0x00070000, %ebx              # Length of copy
-
 JUMP: 
 # jmp far 0010:00020000
         .byte 0x66
@@ -459,7 +454,7 @@ Empty8042Loop:
 # data
 ##############################################################################
 
-        .align 0x2
+        .p2align 1
 
 gdtr:    .word GDT_END - GDT_BASE - 1   
         .long 0                     # (GDT base gets set above)
@@ -467,7 +462,7 @@ gdtr:    .word GDT_END - GDT_BASE - 1
 #   global descriptor table (GDT)
 ##############################################################################
 
-        .align 0x2
+        .p2align 1
 
 GDT_BASE: 
 # null descriptor
@@ -544,7 +539,7 @@ GDT_BASE:
 
 GDT_END: 
 
-        .align 0x2
+        .p2align 1
 
 
 
@@ -560,7 +555,7 @@ idtr:            .word IDT_END - IDT_BASE - 1
 ##############################################################################
 
 #idt_tag db "IDT",0     
-        .align 0x2
+        .p2align 1
 
 IDT_BASE: 
 # divide by zero (INT 0)
@@ -856,7 +851,7 @@ IDT_BASE:
 
 IDT_END: 
 
-        .align 0x2
+        .p2align 1
 
 MemoryMapSize:  .long 0
 MemoryMap:  .long 0,0,0,0,0,0,0,0