X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=DuetPkg%2FBootSector%2Fstart32.S;h=dc683f585b212246cd99a5feabc14e59daa9adf3;hb=bf3b7aae7100b60ff8a387f0b7604dbb6ff29fc9;hp=c47f92763dd0d0efef20b37996797450acdee9db;hpb=b1f700a8593435e2bdc8f9b3dc21bced4774c80f;p=mirror_edk2.git
diff --git a/DuetPkg/BootSector/start32.S b/DuetPkg/BootSector/start32.S
index c47f92763d..dc683f585b 100644
--- a/DuetPkg/BootSector/start32.S
+++ b/DuetPkg/BootSector/start32.S
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
#*
-#* Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.
+#* Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
#* This program and the accompanying materials
#* are licensed and made available under the terms and conditions of the BSD License
#* which accompanies this distribution. The full text of the license may be found at
@@ -18,7 +18,7 @@
#.MODEL small
.stack:
.486p:
- .code:
+ .code16
.equ FAT_DIRECTORY_ENTRY_SIZE, 0x020
.equ FAT_DIRECTORY_ENTRY_SHIFT, 5
@@ -311,11 +311,11 @@ Halt:
ErrorString:
.byte 'S', 0x0c, 'E', 0x0c, 'r', 0x0c, 'r', 0x0c, 'o', 0x0c, 'r', 0x0c, '!', 0x0c
- # .org 0x01fa # Will cause build break
+ .org 0x01fa
LBAOffsetForBootSector:
.long 0x0
- # .org 0x01fe # Will cause build break
+ .org 0x01fe
.word 0xaa55
#******************************************************************************
@@ -328,7 +328,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 0x200 # Will cause build break
+ .org 0x200
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
@@ -413,7 +413,7 @@ Timeout8042:
A20GateEnabled:
-
+ movw $0x0008, %bx # Flat data descriptor
#
# DISABLE INTERRUPTS - Entering Protected Mode
#
@@ -434,11 +434,6 @@ A20GateEnabled:
movl %cr0, %eax
orb $1, %al
movl %eax, %cr0
-
- movl $0x008, %eax # Flat data descriptor
- movl $0x00400000, %ebp # Destination of EFILDR32
- movl $0x00070000, %ebx # Length of copy
-
JUMP:
# jmp far 0010:00020000
.byte 0x66