diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-09 22:39:41 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-09 22:39:41 +0100 |
| commit | 9e84ed63dc71e13b62cea5ec6b0049260cca0b7a (patch) | |
| tree | 4aae9bbc9d5033d514a7601d6972c355808e859c /arch/arm/boot/compressed/Makefile | |
| parent | de9ea203d105f760e8e995c07aa80e855a9aedba (diff) | |
| download | blackbird-op-linux-9e84ed63dc71e13b62cea5ec6b0049260cca0b7a.tar.gz blackbird-op-linux-9e84ed63dc71e13b62cea5ec6b0049260cca0b7a.zip | |
ARM: Partially revert "Auto calculate ZRELADDR and provide option for exceptions"
Partially revert e69edc7, which introduced automatic zreladdr
support. The change in the way the manual definition is defined
seems to be error and conflict prone. Go back to the original way
we were handling this for the time being, while keeping the automatic
zreladdr facility.
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot/compressed/Makefile')
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 68775e33476c..b23f6bc46cfa 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -79,6 +79,10 @@ endif EXTRA_CFLAGS := -fpic -fno-builtin EXTRA_AFLAGS := -Wa,-march=all +# Supply ZRELADDR to the decompressor via a linker symbol. +ifneq ($(CONFIG_AUTO_ZRELADDR),y) +LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR) +endif ifeq ($(CONFIG_CPU_ENDIAN_BE8),y) LDFLAGS_vmlinux += --be8 endif |
