diff options
| author | rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-01-13 06:29:44 +0000 |
|---|---|---|
| committer | rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-01-13 06:29:44 +0000 |
| commit | e7c4ef5ed4a1b14c7514367a5a95e1d9c9e1f090 (patch) | |
| tree | d0b162db1e2d4938028086b1ce93c96f5c58a835 /DuetPkg/BootSector/Mbr.S | |
| parent | e8ef42833f45752e7f41c6ad0925209fc36c16ed (diff) | |
| download | edk2-platforms-e7c4ef5ed4a1b14c7514367a5a95e1d9c9e1f090.tar.xz | |
DuetPkg BootSector: fix bugs in .S files so that 32-bit and 64-bit DUET can boot to Shell with boot sector binaries built by GCC.
There is also a bug in bs32.asm/bs32.S that the space between the code and the 0xAA55 ending signature is not enough to hold the 2 debug strings. It is fixed by shortening the strings.
Signed-off-by: rsun3
Reviewed-by: niruiyu
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12930 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'DuetPkg/BootSector/Mbr.S')
| -rw-r--r-- | DuetPkg/BootSector/Mbr.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/DuetPkg/BootSector/Mbr.S b/DuetPkg/BootSector/Mbr.S index a1ebe06ca5..65c97ea973 100644 --- a/DuetPkg/BootSector/Mbr.S +++ b/DuetPkg/BootSector/Mbr.S @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------
#*
-#* Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+#* Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
#* 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
@@ -54,7 +54,7 @@ _start: xorw %ax, %ax # AX = 0x0000
movw $0x7c00, %bx # BX = 0x7C00
movw $0x600, %bp # BP = 0x0600
- movw RelocatedStart, %si # SI = Offset(RelocatedStart)
+ movw $RelocatedStart, %si # SI = Offset(RelocatedStart)
movw $0x200, %cx # CX = 0x0200
subw %si, %cx # CS = 0x0200 - Offset(RelocatedStart)
leaw (%bp,%si,), %di # DI = 0x0600 + Offset(RelocatedStart)
|