Commit 34275ac2 authored by Paul Cercueil's avatar Paul Cercueil Committed by Thomas Bogendoerfer

mips: Always permit to build u-boot images

The platforms where the kernel should be loaded above 0x8000.0000 do not
support loading u-boot images, that doesn't mean that we shouldn't be
able to generate them.

Additionally, since commit 79876cc1 ("MIPS: new Kconfig option
ZBOOT_LOAD_ADDRESS"), the $(zload-y) variable was no longer hardcoded,
which made it impossible to use the uzImage.bin target.

Fixes: 79876cc1 ("MIPS: new Kconfig option ZBOOT_LOAD_ADDRESS")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 6ddcba9d
...@@ -339,14 +339,12 @@ drivers-$(CONFIG_PM) += arch/mips/power/ ...@@ -339,14 +339,12 @@ drivers-$(CONFIG_PM) += arch/mips/power/
boot-y := vmlinux.bin boot-y := vmlinux.bin
boot-y += vmlinux.ecoff boot-y += vmlinux.ecoff
boot-y += vmlinux.srec boot-y += vmlinux.srec
ifeq ($(shell expr $(load-y) \< 0xffffffff80000000 2> /dev/null), 0)
boot-y += uImage boot-y += uImage
boot-y += uImage.bin boot-y += uImage.bin
boot-y += uImage.bz2 boot-y += uImage.bz2
boot-y += uImage.gz boot-y += uImage.gz
boot-y += uImage.lzma boot-y += uImage.lzma
boot-y += uImage.lzo boot-y += uImage.lzo
endif
boot-y += vmlinux.itb boot-y += vmlinux.itb
boot-y += vmlinux.gz.itb boot-y += vmlinux.gz.itb
boot-y += vmlinux.bz2.itb boot-y += vmlinux.bz2.itb
...@@ -358,9 +356,7 @@ bootz-y := vmlinuz ...@@ -358,9 +356,7 @@ bootz-y := vmlinuz
bootz-y += vmlinuz.bin bootz-y += vmlinuz.bin
bootz-y += vmlinuz.ecoff bootz-y += vmlinuz.ecoff
bootz-y += vmlinuz.srec bootz-y += vmlinuz.srec
ifeq ($(shell expr $(zload-y) \< 0xffffffff80000000 2> /dev/null), 0)
bootz-y += uzImage.bin bootz-y += uzImage.bin
endif
bootz-y += vmlinuz.itb bootz-y += vmlinuz.itb
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment