diff options
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/compressed/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/boot/compressed/vmlinux.lds.in | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 0a8f748e506..9d328be6e5e 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile | |||
@@ -83,9 +83,11 @@ endif | |||
83 | EXTRA_CFLAGS := -fpic -fno-builtin | 83 | EXTRA_CFLAGS := -fpic -fno-builtin |
84 | EXTRA_AFLAGS := -Wa,-march=all | 84 | EXTRA_AFLAGS := -Wa,-march=all |
85 | 85 | ||
86 | # Provide size of uncompressed kernel to the decompressor via a linker symbol. | ||
87 | LDFLAGS_vmlinux := --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image) | ||
86 | # Supply ZRELADDR to the decompressor via a linker symbol. | 88 | # Supply ZRELADDR to the decompressor via a linker symbol. |
87 | ifneq ($(CONFIG_AUTO_ZRELADDR),y) | 89 | ifneq ($(CONFIG_AUTO_ZRELADDR),y) |
88 | LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR) | 90 | LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR) |
89 | endif | 91 | endif |
90 | ifeq ($(CONFIG_CPU_ENDIAN_BE8),y) | 92 | ifeq ($(CONFIG_CPU_ENDIAN_BE8),y) |
91 | LDFLAGS_vmlinux += --be8 | 93 | LDFLAGS_vmlinux += --be8 |
diff --git a/arch/arm/boot/compressed/vmlinux.lds.in b/arch/arm/boot/compressed/vmlinux.lds.in index 366a924019a..5309909d728 100644 --- a/arch/arm/boot/compressed/vmlinux.lds.in +++ b/arch/arm/boot/compressed/vmlinux.lds.in | |||
@@ -43,9 +43,6 @@ SECTIONS | |||
43 | 43 | ||
44 | _etext = .; | 44 | _etext = .; |
45 | 45 | ||
46 | /* Assume size of decompressed image is 4x the compressed image */ | ||
47 | _image_size = (_etext - _text) * 4; | ||
48 | |||
49 | _got_start = .; | 46 | _got_start = .; |
50 | .got : { *(.got) } | 47 | .got : { *(.got) } |
51 | _got_end = .; | 48 | _got_end = .; |