summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/compressed
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-05-27 22:25:26 -0400
committerNicolas Pitre <nico@fluxnic.net>2011-09-14 12:12:12 -0400
commit72bf0bce411d9df0935eb77256604212de8f89cc (patch)
tree13619f008d289960721f90c78ca64b56f94a78a4 /arch/arm/boot/compressed
parentc6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff)
downloadblackbird-op-linux-72bf0bce411d9df0935eb77256604212de8f89cc.tar.gz
blackbird-op-linux-72bf0bce411d9df0935eb77256604212de8f89cc.zip
ARM: zImage: ensure it is always a multiple of 64 bits in size
This is needed for proper alignment when the DTB appending feature is used. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Tony Lindgren <tony@atomide.com> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dave Martin <dave.martin@linaro.org> Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
Diffstat (limited to 'arch/arm/boot/compressed')
-rw-r--r--arch/arm/boot/compressed/vmlinux.lds.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/vmlinux.lds.in b/arch/arm/boot/compressed/vmlinux.lds.in
index 4e728834a1b9..4919f2ac8b89 100644
--- a/arch/arm/boot/compressed/vmlinux.lds.in
+++ b/arch/arm/boot/compressed/vmlinux.lds.in
@@ -51,6 +51,10 @@ SECTIONS
_got_start = .;
.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); }
_edata = .;
. = BSS_START;
OpenPOWER on IntegriCloud