diff options
author | Shmulik Ladkani <shmulik.ladkani@gmail.com> | 2010-08-31 13:24:19 +0300 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-10-04 18:34:00 +0100 |
commit | 2ccc5b150fb771bcbbb27a19a00e176e10b7f11e (patch) | |
tree | 711d6dceb694b10a827347e4d29e3297887c99ea | |
parent | 2b877a3ff41b6d7e3ade0739ac840fb6c89f3b1f (diff) | |
download | linux-stable-2ccc5b150fb771bcbbb27a19a00e176e10b7f11e.tar.gz linux-stable-2ccc5b150fb771bcbbb27a19a00e176e10b7f11e.tar.bz2 linux-stable-2ccc5b150fb771bcbbb27a19a00e176e10b7f11e.zip |
MIPS: Calculate VMLINUZ_LOAD_ADDRESS based on the length of vmlinux.bin
Fix VMLINUZ_LOAD_ADDRESS calculation to be based on the length of
vmlinux.bin, the actual uncompressed kernel binary.
Previously it was based on the length of KBUILD_IMAGE (the unstripped ELF
vmlinux), which is bigger than vmlinux.bin. As a result, vmlinuz was
loaded into a memory address higher then actually needed - a problem for
small memory platforms.
Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
To: linux-mips@linux-mips.org
Cc: alex@digriz.org.uk
Cc: manuel.lauss@googlemail.com
Cc: sam@ravnborg.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1564/
Acked-by: Wu Zhangjin <wuzhangjin@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/boot/compressed/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile index ed9bb709c9a3..5fd7f7a58b7e 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile @@ -59,7 +59,7 @@ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE hostprogs-y := calc_vmlinuz_load_addr VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \ - $(objtree)/$(KBUILD_IMAGE) $(VMLINUX_LOAD_ADDRESS)) + $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS)) vmlinuzobjs-y += $(obj)/piggy.o |