BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

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

diff --git a/DuetPkg/BootSector/start.S b/DuetPkg/BootSector/start.S
index 706def4929b5c9df8f8e873bdf992d6120d551d0..f96d06e14491326dc6767f37f9240a2906dce5d2 100644 (file)
--- a/DuetPkg/BootSector/start.S
+++ b/DuetPkg/BootSector/start.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------\r
 #*\r
-#*   Copyright 2006 - 2007, Intel Corporation                                                         \r
-#*   All rights reserved. This program and the accompanying materials                          \r
+#*   Copyright (c) 2006 - 2011, 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
 #*   http://opensource.org/licenses/bsd-license.php                                            \r
@@ -18,7 +18,7 @@
         .stack: \r
         .486p: \r
         .code16\r
-               \r
+    \r
 .equ                        FAT_DIRECTORY_ENTRY_SIZE, 0x020\r
 .equ                        FAT_DIRECTORY_ENTRY_SHIFT, 5\r
 .equ                        BLOCK_SIZE, 0x0200\r
@@ -404,6 +404,7 @@ Timeout8042:
 \r
 \r
 A20GateEnabled: \r
+        movw    $0x0008, %bx                # Flat data descriptor\r
 \r
 #\r
 # DISABLE INTERRUPTS - Entering Protected Mode\r
@@ -425,11 +426,6 @@ A20GateEnabled:
         movl    %cr0, %eax\r
         orb     $1, %al\r
         movl    %eax, %cr0\r
-\r
-        movl $0x008, %eax                   # Flat data descriptor\r
-        movl $0x00400000, %ebp              # Destination of EFILDR32\r
-        movl $0x00070000, %ebx              # Length of copy\r
-\r
 JUMP: \r
 # jmp far 0010:00020000\r
         .byte 0x66\r
@@ -450,7 +446,7 @@ Empty8042Loop:
 # data\r
 ##############################################################################\r
 \r
-        .align 0x2\r
+        .p2align 1\r
 \r
         gdtr:    .long  GDT_END - GDT_BASE - 1  # GDT limit \r
         .long 0                                 # (GDT base gets set above)\r
@@ -458,7 +454,7 @@ Empty8042Loop:
 #   global descriptor table (GDT)\r
 ##############################################################################\r
 \r
-        .align 0x2\r
+        .p2align 1\r
 \r
 GDT_BASE: \r
 # null descriptor\r
@@ -535,7 +531,7 @@ GDT_BASE:
 \r
 GDT_END: \r
 \r
-        .align 0x2\r
+        .p2align 1\r
 \r
 \r
 \r
@@ -551,7 +547,7 @@ idtr:  .long  IDT_END - IDT_BASE - 1 # IDT limit
 ##############################################################################\r
 \r
 #idt_tag db "IDT",0     \r
-        .align 0x2\r
+        .p2align 1\r
 \r
 IDT_BASE: \r
 # divide by zero (INT 0)\r
@@ -715,7 +711,7 @@ IDT_BASE:
         .word 0            # offset 31:16\r
 \r
 # 85 unspecified descriptors, First 12 of them are reserved, the rest are avail\r
-               .fill 85 * 8, 1, 0   # db (85 * 8) dup(0)\r
+    .fill 85 * 8, 1, 0   # db (85 * 8) dup(0)\r
 \r
 # IRQ 0 (System timer) - (INT 0x68)\r
 .equ                IRQ0_SEL, .-IDT_BASE\r
@@ -847,7 +843,7 @@ IDT_BASE:
 \r
 IDT_END: \r
 \r
-        .align 0x2\r
+        .p2align 1\r
 \r
 MemoryMapSize:  .long 0\r
 MemoryMap:  .long 0,0,0,0,0,0,0,0\r