From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-x229.google.com (mail-wr0-x229.google.com [IPv6:2a00:1450:400c:c0c::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 053AE21A0483A for ; Wed, 12 Apr 2017 16:27:09 -0700 (PDT) Received: by mail-wr0-x229.google.com with SMTP id l28so26057429wre.0 for ; Wed, 12 Apr 2017 16:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=d+lyLHz0SFxfTajzn5WOPc9cEqfP0XSTUuAU4QQb8UY=; b=WpwttUWdY66Dscp6PWIde94QMH86V4POj//ij8Z5D2N9QEIm+OXTzJ0z2WuFhg/o6C 8PJeKGjbnio5/uP7/kMvLSGlY1DhaUMiUU89OF/GIgyCAjmNqnHa3kqQkPZTdMY+ADLf qQJ3aI9XP2T1o1Gw3dJcVNCDH6O638jhzpjfTnvQF/KxWg6Xjh1SZWkkSC6VHKRijoQC hFKixrjDY1RK2sJS3v9uav9JAt2H1IRzjVf3Gg6razgHbc93rZhnCYvDZ+NFSjRbY3AD m/r2tfs/VvJYV7TpBe+yRAe4n71uvKzSoU1rCrzcw4GW3Jag4l1oQtklWJm6eKZ2B8+O AFNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=d+lyLHz0SFxfTajzn5WOPc9cEqfP0XSTUuAU4QQb8UY=; b=DHtXq6glrBemTMpkFXmFhagAojZTpQSU5NRtDGPLXrIB4LGFqtxqN9eXXO681NHdw6 VZi1tFamApxe38DSnOQZTQa0QXbrLQQ8LuZw2hT1jKJ2PtLRJ3wM9dPzb9X2jD3B8ue6 SlRPO6dORZr+XwhfzKgMcCwOjbScLEU33yFw01xYUmSrj1nqDvbjKni7izfT44PTA+JO tsZuc+3I+WqCwdP/jkgKGSxf132nlgE+qTjTRCsbKqc2DtY2Yrl7xgzUkouh3vILzupM xEGEQIQnaLM461z9EsJ+GVs142/80dVpYAJuAXPrfzVZg3Bwa7vBKEvO0wiwcm+i+Tc8 dYAw== X-Gm-Message-State: AN3rC/4HdIxgJRXgIf6BgA1RdFkPYyCcPD+zmB1QJIzAVsGNa2vMEi9S 1oSRebatTNvej3EC9lWVeqlUR71FMnBL X-Received: by 10.223.148.97 with SMTP id 88mr141070wrq.174.1492039627174; Wed, 12 Apr 2017 16:27:07 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.203.137 with HTTP; Wed, 12 Apr 2017 16:27:06 -0700 (PDT) From: James Tucker Date: Wed, 12 Apr 2017 16:27:06 -0700 Message-ID: To: edk2-devel@lists.01.org Cc: Ruiyu Ni Subject: [PATCH 1/1] DuetPkg/BootSector: fix .S sources for GNU builds X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2017 23:27:09 -0000 Content-Type: text/plain; charset=UTF-8 Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: James Tucker --- 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