lkml.org 
[lkml]   [2017]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] ARM: Fix zImage file size not aligned with CONFIG_EFI_STUB enabled
From
Date
Tested-by: Chris Zhong <zyw@rock-chips.com>


On Wednesday, October 18, 2017 01:01 PM, Jeffy Chen wrote:
> 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);

--
Chris Zhong


\
 
 \ /
  Last update: 2017-10-22 17:09    [W:1.143 / U:0.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site