From: James Tucker <raggi@google.com>
To: edk2-devel@lists.01.org
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Subject: [PATCH 1/1] DuetPkg/BootSector: fix .S sources for GNU builds
Date: Wed, 12 Apr 2017 16:27:06 -0700 [thread overview]
Message-ID: <CALMiPQBWY=zvNa-o69mHmVLYz4Z3+GqHqkY+DB0W5mc_1jMtqQ@mail.gmail.com> (raw)
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: James Tucker <raggi@google.com>
---
DuetPkg/BootSector/Gpt.S | 22 +++++++++++-----------
DuetPkg/BootSector/bs32.S | 1 +
DuetPkg/BootSector/efi64.S | 2 +-
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/DuetPkg/BootSector/Gpt.S b/DuetPkg/BootSector/Gpt.S
index 821ca846f0..f126b26eb9 100644
--- a/DuetPkg/BootSector/Gpt.S
+++ b/DuetPkg/BootSector/Gpt.S
@@ -241,32 +241,32 @@ ErrorString:
# PhysicalDrive - Used to indicate which disk to be boot
# Can be patched by tool
# ****************************************************************************
- # .org 0x01B6 # Just for passing build.
+ .org 0x01B6
PhysicalDrive: .byte 0x80
# ****************************************************************************
# GptPartitionIndicator - Used to indicate which GPT partition to be boot
# Can be patched by tool
# ****************************************************************************
- # .org 0x01B7 # Just for passing build.
+ .org 0x01B7
GptPartitionIndicator: .byte 0
# ****************************************************************************
# Unique MBR signature
# ****************************************************************************
- # .org 0x01B8 # Just for passing build.
+ .org 0x01B8
.ascii "DUET"
# ****************************************************************************
# Unknown
# ****************************************************************************
- # .org 0x01BC # Just for passing build.
+ .org 0x01BC
.word 0
# ****************************************************************************
# PMBR Entry - Can be patched by tool
# ****************************************************************************
- # .org 0x01BE # Just for passing build.
+ .org 0x01BE
.byte 0 # Boot Indicator
.byte 0xff # Start Header
.byte 0xff # Start Sector
@@ -278,20 +278,20 @@ GptPartitionIndicator: .byte 0
.long 1 # Starting LBA
.long 0xFFFFFFFF # End LBA
- # .org 0x01CE # Just for passing build.
+ .org 0x01CE
.long 0,0,0,0
- # .org 0x01DE # Just for passing build.
+ .org 0x01DE
+ .long 0,0,0,0
+ .org 0x01EE
.long 0,0,0,0
- # .org 0x01EE # Just for passing build.
- .long 0,0,0,0
# ****************************************************************************
# Sector Signature
# ****************************************************************************
- # .org 0x01FE # Just for passing build.
+ .org 0x01FE
SectorSignature:
- .word 0xaa55 # Boot Sector Signature
+ .word 0xaa55 # Boot Sector Signature
diff --git a/DuetPkg/BootSector/bs32.S b/DuetPkg/BootSector/bs32.S
index 2584517386..fa42163174 100644
--- a/DuetPkg/BootSector/bs32.S
+++ b/DuetPkg/BootSector/bs32.S
@@ -292,6 +292,7 @@ StartString:
ErrorString:
.byte 'B', 0x0c, 'E', 0x0c, 'r', 0x0c, 'r', 0x0c, 'o', 0x0c, 'r', 0x0c
+
# ****************************************************************************
# LBA Offset for BootSector, need patched by tool for HD boot.
# ****************************************************************************
diff --git a/DuetPkg/BootSector/efi64.S b/DuetPkg/BootSector/efi64.S
index 34bd7521b9..7fc1037352 100644
--- a/DuetPkg/BootSector/efi64.S
+++ b/DuetPkg/BootSector/efi64.S
@@ -14,7 +14,6 @@
#* Abstract:
#*
#------------------------------------------------------------------------------
-
##############################################################################
# Now in 64-bit long mode.
##############################################################################
@@ -22,6 +21,7 @@
.486:
.stack:
.code:
+ .code32
.org 0x21000
.global _start
--
2.12.2.715.g7642488e1d-goog
reply other threads:[~2017-04-12 23:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALMiPQBWY=zvNa-o69mHmVLYz4Z3+GqHqkY+DB0W5mc_1jMtqQ@mail.gmail.com' \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox