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

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

diff --git a/DuetPkg/BootSector/bs32.S b/DuetPkg/BootSector/bs32.S
index f2e3b91454888fa84bd161f258e2eab17922961e..f36820c7b67b8f37fc4466968e26933e1adf5905 100644 (file)
--- a/DuetPkg/BootSector/bs32.S
+++ b/DuetPkg/BootSector/bs32.S
@@ -16,10 +16,9 @@
 #------------------------------------------------------------------------------\r
 \r
         #.MODEL small\r
-        #.stack: \r
-        #.486p: \r
-        #.code: \r
-.section .text
+        .stack: \r
+        .486p: \r
+        .code16\r
 \r
 .equ                      FAT_DIRECTORY_ENTRY_SIZE, 0x0020\r
 .equ                      FAT_DIRECTORY_ENTRY_SHIFT, 5\r
@@ -31,8 +30,8 @@
 .equ                      LOADER_FILENAME_PART2, 0x30325244    # "DR20"\r
 .equ                      LOADER_FILENAME_PART3, 0x20202030    # "0___"\r
 \r
-        .org 0x00
-.global _start
+        .org 0x0\r
+.global _start\r\r
 _start:\r
 Ia32Jump: \r
   jmp   BootSectorEntryPoint  # JMP inst                  - 3 bytes\r
@@ -80,7 +79,7 @@ BootSectorEntryPoint:
 # ****************************************************************************\r
 # Start Print\r
 # ****************************************************************************\r
-  leaw %cs:StartString, %si\r
+  movw $StartString, %si\r
   call PrintString\r
 \r
 # ****************************************************************************\r
@@ -283,7 +282,7 @@ NotFoundAll:
   jne  FoundEFILDR\r
 BadBootSector: \r
 DiskError: \r
-  leaw %cs:ErrorString, %si\r
+  movw $ErrorString, %si\r
   call PrintString\r
 Halt: \r
   jmp   Halt\r
@@ -297,7 +296,7 @@ ErrorString:
 # LBA Offset for BootSector, need patched by tool for HD boot.\r
 # ****************************************************************************\r
 \r
-  # .org 0x01fa  # BUG_BUG\r
+  #.org 0x01fa\r
 LBAOffsetForBootSector: \r
   .long     0x0\r
 \r
@@ -305,7 +304,7 @@ LBAOffsetForBootSector:
 # Sector Signature\r
 # ****************************************************************************\r
 \r
-  # .org 0x01fe  # BUG_BUG\r
+  #.org 0x01fe\r
 SectorSignature: \r
   .word     0xaa55      # Boot Sector Signature\r
 \r