diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-27 22:25:26 -0400 |
---|---|---|
committer | Simone Willett <swillett@nvidia.com> | 2012-08-03 17:36:19 -0700 |
commit | edb920f1cf85c71f534da18bf994a788379fdb56 (patch) | |
tree | a91d38659af3241195934f97efdd1c46509e91ff /arch/arm/boot | |
parent | b3b161fa7c26b3902ec4a024ed174ac7f74d5108 (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>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Dave Martin <dave.martin@linaro.org>
Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Chinmay Kamat <ckamat@nvidia.com>
Change-Id: I18dd4220a40984ab2551ca17a16db37193ffe80c
Original: 72bf0bce411d9df0935eb77256604212de8f89cc
Reviewed-on: http://git-master/r/108696
Reviewed-by: Stephen Warren <swarren@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/compressed/vmlinux.lds.in | 4 |
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; |