1 files changed, 10 insertions, 8 deletions
diff --git a/DuetPkg/BootSector/start16.S b/DuetPkg/BootSector/start16.S
index de845215d1..f0ff82a829 100644
--- a/DuetPkg/BootSector/start16.S
+++ b/DuetPkg/BootSector/start16.S
@@ -26,7 +26,9 @@
 .equ                        BLOCK_MASK,                 0x01ff
 .equ                        BLOCK_SHIFT,                9
 
-        .org 0x00
+        .org 0x00
+.global _start
+_start:
 Ia32Jump: 
   jmp   BootSectorEntryPoint  # JMP inst    - 3 bytes
   nop
@@ -74,7 +76,7 @@ BootSectorEntryPoint:
 NoVarStore: 
         pushw   %es
 # Set the 5th byte start @ 0:19000 to non-zero indicating we should init var store header in DxeIpl
-        movb    %al, %es:($4)
+        movb    %al, %es:4
         jmp     SaveVolumeId
 
 CheckVarStoreSize: 
@@ -85,7 +87,7 @@ CheckVarStoreSize:
 
 LoadVarStore: 
         movb    $0, %al
-        movb    %al, %es:($4)
+        movb    %al, %es:4
         movw    (%di), %cx
 #       ES:DI = 1500:0
         xorw    %di, %di
@@ -96,9 +98,9 @@ LoadVarStore:
 SaveVolumeId: 
         popw    %es
         movw    VolId(%bp), %ax
-        movw    %ax, %es:($0)                       # Save Volume Id to 0:19000. we will find the correct volume according to this VolumeId
+        movw    %ax, %es:0                      # Save Volume Id to 0:19000. we will find the correct volume according to this VolumeId
         movw    VolId+2(%bp), %ax
-        movw    %ax, %es:($2)
+        movw    %ax, %es:2
 
 # Read Efildr
         popw    %cx
@@ -292,11 +294,11 @@ Halt:
 ErrorString: 
         .byte 'S', 0x0c, 'E', 0x0c, 'r', 0x0c, 'r', 0x0c, 'o', 0x0c, 'r', 0x0c, '!', 0x0c
 
-        .org     0x01fa
+        # .org     0x01fa # Just for passing build.
 LBAOffsetForBootSector: 
         .long   0x0
 
-        .org     0x01fe
+        # .org     0x01fe # Just for passing build.
         .word   0xaa55
 
 #******************************************************************************
@@ -309,7 +311,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     0x0200
+        # .org     0x0200 # Just for passing build.
         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