From: ard.biesheuvel@linaro.org (Ard Biesheuvel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 4/8] arm64: efi: clean up Image header after PE header has been split off
Date: Thu, 23 Mar 2017 19:00:47 +0000 [thread overview]
Message-ID: <20170323190051.14882-5-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20170323190051.14882-1-ard.biesheuvel@linaro.org>
After having split off the PE header, clean up the bits that remain:
use .long consistently, merge two adjacent #ifdef CONFIG_EFI blocks,
fix the offset of the PE header pointer and remove the redundant .align
that follows it.
Also, since we will be eliminating all open coded constants from the
EFI header in subsequent patches, let's replace the open coded "ARM\x64"
magic number with its .ascii equivalent.
No changes to the resulting binary image are intended.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm64/kernel/head.S | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index c1977bed01db..6d49e716bf40 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -91,20 +91,14 @@ _head:
.quad 0 // reserved
.quad 0 // reserved
.quad 0 // reserved
- .byte 0x41 // Magic number, "ARM\x64"
- .byte 0x52
- .byte 0x4d
- .byte 0x64
+ .ascii "ARM\x64" // Magic number
#ifdef CONFIG_EFI
.long pe_header - _head // Offset to the PE header.
-#else
- .word 0 // reserved
-#endif
-#ifdef CONFIG_EFI
- .align 3
pe_header:
__EFI_PE_HEADER
+#else
+ .long 0 // reserved
#endif
__INIT
--
2.9.3
next prev parent reply other threads:[~2017-03-23 19:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-23 19:00 [PATCH v3 0/8] arm64: efi: PE/COFF cleanup/hardening Ard Biesheuvel
2017-03-23 19:00 ` [PATCH v3 1/8] include: pe.h: allow for use in assembly Ard Biesheuvel
2017-03-23 19:00 ` [PATCH v3 2/8] include: pe.h: add some missing definitions Ard Biesheuvel
2017-03-23 19:00 ` [PATCH v3 3/8] arm64: efi: move EFI header and related data to a separate .S file Ard Biesheuvel
2017-03-23 19:00 ` Ard Biesheuvel [this message]
2017-03-30 18:26 ` [PATCH v3 4/8] arm64: efi: clean up Image header after PE header has been split off Will Deacon
2017-03-30 18:26 ` Mark Rutland
2017-03-23 19:00 ` [PATCH v3 5/8] arm64: efi: remove forbidden values from the PE/COFF header Ard Biesheuvel
2017-03-23 19:00 ` [PATCH v3 6/8] arm64: efi: remove pointless dummy .reloc section Ard Biesheuvel
2017-03-23 19:00 ` [PATCH v3 7/8] arm64: efi: replace open coded constants with symbolic ones Ard Biesheuvel
2017-03-23 19:00 ` [PATCH v3 8/8] arm64: efi: split Image code and data into separate PE/COFF sections Ard Biesheuvel
2017-03-30 18:29 ` Mark Rutland
2017-04-04 15:33 ` [PATCH v3 0/8] arm64: efi: PE/COFF cleanup/hardening Ard Biesheuvel
2017-04-04 16:57 ` Catalin Marinas
2017-04-04 17:02 ` Ard Biesheuvel
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-all 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=20170323190051.14882-5-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).