From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org
Cc: chris.zhong@rock-chips.com,
Jeffy Chen <jeffy.chen@rock-chips.com>,
Ingo Molnar <mingo@kernel.org>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Russell King <linux@armlinux.org.uk>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: Fix zImage file size not aligned with CONFIG_EFI_STUB enabled
Date: Wed, 18 Oct 2017 13:01:07 +0800 [thread overview]
Message-ID: <20171018050108.10352-1-jeffy.chen@rock-chips.com> (raw)
The zImage file size should be aligned.
Fixes: e4bae4d0b5f3 ("arm/efi: Split zImage code and data into separate PE/COFF sections")
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
arch/arm/boot/compressed/vmlinux.lds.S | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/compressed/vmlinux.lds.S b/arch/arm/boot/compressed/vmlinux.lds.S
index b38dcef90756..1636fa259577 100644
--- a/arch/arm/boot/compressed/vmlinux.lds.S
+++ b/arch/arm/boot/compressed/vmlinux.lds.S
@@ -70,10 +70,6 @@ SECTIONS
.got : { *(.got) }
_got_end = .;
- /* ensure the zImage file size is always a multiple of 64 bits */
- /* (without a dummy byte, ld just ignores the empty section) */
- .pad : { BYTE(0); . = ALIGN(8); }
-
#ifdef CONFIG_EFI_STUB
.data : ALIGN(4096) {
__pecoff_data_start = .;
@@ -93,6 +89,10 @@ SECTIONS
__pecoff_data_rawsize = . - ADDR(.data);
#endif
+ /* ensure the zImage file size is always a multiple of 64 bits */
+ /* (without a dummy byte, ld just ignores the empty section) */
+ .pad : { BYTE(0); . = ALIGN(8); }
+
_edata = .;
_magic_sig = ZIMAGE_MAGIC(0x016f2818);
--
2.11.0
next reply other threads:[~2017-10-18 5:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-18 5:01 Jeffy Chen [this message]
2017-10-18 6:19 ` Chris Zhong
2017-10-22 11:01 ` Ard Biesheuvel
2017-10-22 12:47 ` Russell King - ARM Linux
2017-10-22 13:01 ` Ard Biesheuvel
2017-10-23 3:26 ` jeffy
2017-10-23 8:50 ` Russell King - ARM Linux
2017-10-23 10:24 ` jeffy
2017-10-23 10:50 ` Russell King - ARM Linux
2017-10-23 11:45 ` Russell King - ARM Linux
2017-10-24 8:09 ` Ard Biesheuvel
2017-10-24 9:09 ` Russell King - ARM Linux
2017-10-24 9:13 ` Ard Biesheuvel
2017-10-24 9:22 ` Russell King - ARM Linux
2017-10-24 9:26 ` Ard Biesheuvel
2017-10-24 9:30 ` Ard Biesheuvel
2017-10-24 9:38 ` Russell King - ARM Linux
2017-10-24 9:44 ` Ard Biesheuvel
2017-10-24 9:54 ` Russell King - ARM Linux
2017-10-24 10:03 ` Ard Biesheuvel
2017-10-24 9:16 ` jeffy
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=20171018050108.10352-1-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=ard.biesheuvel@linaro.org \
--cc=chris.zhong@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mingo@kernel.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
all inboxes | Powered by JetHome®