ARM: 6503/1: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL
authorDave Martin <dave.martin@linaro.org>
Mon, 29 Nov 2010 18:43:27 +0000 (19:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 30 Nov 2010 13:44:26 +0000 (13:44 +0000)
commit26e5ca93dda9425f8ff78ccb2f9b193328087e45
treefae95715e23c176c804766612b5d2702c236fcf0
parentbfa64c4ab1235b732542f11f4e0005e1774f779a
ARM: 6503/1: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL

The code which makes up the zImage header intends to leave a
32-byte gap followed by a branch to the real entry point, a magic
number, and a word containing the absolute entry point address.

This gets messed up with with CONFIG_THUMB2_KERNEL, because the
size of the initial padding NOPs changes.

Instead, the header can be made fully compatible by restoring it to
ARM.

In the Thumb-2 case, we can replace the initial NOPs with a
sequence which switches to Thumb and jumps to the real entry point.

As a consequence, the zImage entry point is now always ARM, so no
special magic is needed any more for the uImage rules in the
Thumb-2 case.

Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/boot/Makefile
arch/arm/boot/compressed/head.S