DuetPkg BootSector: fix bugs in .S files so that 32-bit and 64-bit DUET can boot...

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

diff --git a/DuetPkg/BootSector/bs32.S b/DuetPkg/BootSector/bs32.S
index d768518e85c3a144a184f5a0045b224512f7cc65..95424f3d695fd59c9d706b582910150fac483e27 100644 (file)
--- a/DuetPkg/BootSector/bs32.S
+++ b/DuetPkg/BootSector/bs32.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #*\r
-#*   Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>\r
+#*   Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
 #*   This program and the accompanying materials                          \r
 #*   are licensed and made available under the terms and conditions of the BSD License         \r
 #*   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -207,7 +207,7 @@ PrintString:
   movw %ax, %es\r
   movw $0x7c0, %ax\r
   movw %ax, %ds\r
-  movw $7, %cx\r
+  movw $6, %cx\r
   movw $160, %di\r
   rep\r
   movsw\r
@@ -288,15 +288,15 @@ Halt:
   jmp   Halt\r
 \r
 StartString: \r
-  .byte 'B', 0x0c, 'S', 0x0c, 't', 0x0c, 'a', 0x0c, 'r', 0x0c, 't', 0x0c, '!', 0x0c\r
+  .byte 'B', 0x0c, 'S', 0x0c, 't', 0x0c, 'a', 0x0c, 'r', 0x0c, 't', 0x0c\r
 ErrorString: \r
-  .byte 'B', 0x0c, 'E', 0x0c, 'r', 0x0c, 'r', 0x0c, 'o', 0x0c, 'r', 0x0c, '!', 0x0c\r
+  .byte 'B', 0x0c, 'E', 0x0c, 'r', 0x0c, 'r', 0x0c, 'o', 0x0c, 'r', 0x0c\r
 \r
 # ****************************************************************************\r
 # LBA Offset for BootSector, need patched by tool for HD boot.\r
 # ****************************************************************************\r
 \r
-  #.org 0x01fa\r
+  .org 0x01fa\r
 LBAOffsetForBootSector: \r
   .long     0x0\r
 \r
@@ -304,7 +304,7 @@ LBAOffsetForBootSector:
 # Sector Signature\r
 # ****************************************************************************\r
 \r
-  #.org 0x01fe\r
+  .org 0x01fe\r
 SectorSignature: \r
   .word     0xaa55      # Boot Sector Signature\r
 \r