git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8563 6f19259b...

[mirror_edk2.git] / DuetPkg / BootSector / start32.S

diff --git a/DuetPkg/BootSector/start32.S b/DuetPkg/BootSector/start32.S
index 3ddebfc8627784b7e02789376fd7d5fdfcc9fe11..5a5755838ac3ddbead6e5f1398eff0467ca03c68 100644 (file)
--- a/DuetPkg/BootSector/start32.S
+++ b/DuetPkg/BootSector/start32.S
@@ -26,7 +26,11 @@
 .equ                        BLOCK_MASK, 0x01ff\r
 .equ                        BLOCK_SHIFT, 9\r
 \r
-        .org 0x0\r
+        .org 0x0
+
+.global _start
+_start:
+\r
 Ia32Jump: \r
   jmp   BootSectorEntryPoint  # JMP inst    - 3 bytes\r
   nop\r
@@ -89,7 +93,7 @@ BootSectorEntryPoint:
 NoVarStore: \r
         pushw   %es\r
 # Set the 5th byte start @ 0:19000 to non-zero indicating we should init var store header in DxeIpl\r
-        movb    %al, %es:($4)\r
+        movb    %al, %es:4\r
         jmp     SaveVolumeId\r
 \r
 CheckVarStoreSize: \r
@@ -100,7 +104,7 @@ CheckVarStoreSize:
 \r
 LoadVarStore: \r
         movb    $0, %al\r
-        movb    %al, %es:($4)\r
+        movb    %al, %es:4\r
         movw    (%di), %cx\r
 #       ES:DI = 1500:0\r
         xorw    %di, %di\r
@@ -111,9 +115,9 @@ LoadVarStore:
 SaveVolumeId: \r
         popw    %es\r
         movw    VolId(%bp), %ax\r
-        movw    %ax, %es:($0)                       # Save Volume Id to 0:19000. we will find the correct volume according to this VolumeId\r
+        movw    %ax, %es:0                       # Save Volume Id to 0:19000. we will find the correct volume according to this VolumeId\r
         movw    VolId+2(%bp), %ax\r
-        movw    %ax, %es:($2)\r
+        movw    %ax, %es:2\r
 \r
 # Read Efildr\r
         popw    %cx\r
@@ -307,11 +311,11 @@ Halt:
 ErrorString: \r
         .byte 'S', 0x0c, 'E', 0x0c, 'r', 0x0c, 'r', 0x0c, 'o', 0x0c, 'r', 0x0c, '!', 0x0c\r
 \r
-        .org     0x01fa  # Will cause build break\r
+        # .org     0x01fa  # Will cause build break\r
 LBAOffsetForBootSector: \r
         .long   0x0\r
 \r
-        .org    0x01fe   # Will cause build break\r
+        # .org    0x01fe   # Will cause build break\r
         .word   0xaa55\r
 \r
 #******************************************************************************\r
@@ -324,7 +328,7 @@ LBAOffsetForBootSector:
 .equ                 WRITE_DATA_PORT_CMD, 0x0d1  # 8042 command to write the data port\r
 .equ                 ENABLE_A20_CMD, 0x0df       # 8042 command to enable A20\r
 \r
-.org     0x200  # Will cause build break\r
+# .org     0x200  # Will cause build break\r
         jmp start\r
 Em64String: \r
         .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\r