DuetPkg BootSector: Clean up .S files for 64-bit Duet for GCC build.

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

diff --git a/DuetPkg/BootSector/start64.S b/DuetPkg/BootSector/start64.S
index b8f1e60f8a154a84fe839c9b5c08737ca5499613..75626b86a48799afb4db523cda995c48f0029d96 100644 (file)
--- a/DuetPkg/BootSector/start64.S
+++ b/DuetPkg/BootSector/start64.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
@@ -27,6 +27,10 @@
 .equ                        BLOCK_SHIFT, 9\r
 \r
         .org 0x0\r
+\r
+.global _start\r
+_start:\r
+\r
 Ia32Jump: \r
   jmp   BootSectorEntryPoint  # JMP inst    - 3 bytes\r
   nop\r
@@ -123,11 +127,11 @@ CheckEm64T:
         movw $18,%cx\r
         jmp  PrintStringAndHalt\r
 CheckEm64TPass: \r
-jumpFarInstruction: \r
+JumpFarInstruction: \r
         .byte 0xea\r
-jumpOffset: \r
+JumpOffset: \r
         .word 0x200\r
-jumpSegment: \r
+JumpSegment: \r
         .word 0x2000\r
 \r
 \r
@@ -510,7 +514,7 @@ In32BitProtectedMode:
     #\r
     # Enable paging to activate long mode (set CR0.PG=1)\r
     #\r
-    movl  $cr0, %eax      # Read CR0.\r
+    movl  %cr0, %eax      # Read CR0.\r
     .byte 0xf\r
     .byte 0xba\r
     .byte 0xe8\r
@@ -1105,7 +1109,6 @@ MemoryMap:  .long 0,0,0,0,0,0,0,0
         .long 0,0,0,0,0,0,0,0\r
         .long 0,0,0,0,0,0,0,0\r
 \r
-        .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r
         .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r
 \r
         .org 0x0fe0\r