summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-05-27 22:25:26 -0400
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-06-23 02:37:18 -0400
commit997b83c7a831f415e8bd80632bcb71c8073c9ba0 (patch)
treee0333df3453834c60f3c04c0fcf4503ccef5b66f
parentcd7756d855442931cd206f292980b6b48eef132e (diff)
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>
-rw-r--r--arch/arm/boot/compressed/vmlinux.lds.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/vmlinux.lds.in b/arch/arm/boot/compressed/vmlinux.lds.in
index ea80abe7884..6c02db134f2 100644
--- a/arch/arm/boot/compressed/vmlinux.lds.in
+++ b/arch/arm/boot/compressed/vmlinux.lds.in
@@ -47,6 +47,9 @@ SECTIONS
.got : { *(.got) }
_got_end = .;
.got.plt : { *(.got.plt) }
+
+ /* ensure the zImage file size is always a multiple of 64 bits */
+ .pad : { BYTE(0); . = ALIGN(8); }
_edata = .;
. = BSS_START;