MIPS: new Kconfig option ZBOOT_LOAD_ADDRESS

If this option is not 0x0, it will be used for zboot load address.
Otherwise, the result of calc_vmlinuz_load_addr will be used.

The zload-y value for generic are also removed then, as the current
value breaks booting on qemu -M boston.
The result of calc_vmlinuz_load_addr works well for most of cases.

The default value of bcm47xx keeps as it currently.

Signed-off-by: YunQiang Su <yunqiang.su@cipunited.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f1c8f7eb241c8b8aa009afeb8aa666dca9c2dc1d..46b093eadc40a2289b015b977db41f91289d0440 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2115,6 +2115,16 @@ config MIPS_VA_BITS_48
 
          If unsure, say N.
 
+config ZBOOT_LOAD_ADDRESS
+       hex "Compressed kernel load address"
+       default 0xffffffff80400000 if BCM47XX
+       default 0x0
+       depends on SYS_SUPPORTS_ZBOOT
+       help
+         The address to load compressed kernel, aka vmlinuz.
+
+         This is only used if non-zero.
+
 choice
        prompt "Kernel page size"
        default PAGE_SIZE_4KB

diff --git a/arch/mips/bcm47xx/Platform b/arch/mips/bcm47xx/Platform
index 833b204fe5dace78b7f7b5ff882ffcd2b32b5dc3..fe6daba3f9484c6d52fa072fc51cc8abad8fd32d 100644 (file)
--- a/arch/mips/bcm47xx/Platform
+++ b/arch/mips/bcm47xx/Platform
@@ -4,4 +4,3 @@
 cflags-$(CONFIG_BCM47XX)       +=                                      \
                -I$(srctree)/arch/mips/include/asm/mach-bcm47xx
 load-$(CONFIG_BCM47XX)         := 0xffffffff80001000
-zload-$(CONFIG_BCM47XX)                += 0xffffffff80400000

diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index f27cf31b41401423b9ef51f703fcf03434fa7d3d..85d5082db917fdac5f7f044c118633ce02867655 100644 (file)
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -89,6 +89,10 @@ HOSTCFLAGS_calc_vmlinuz_load_addr.o += $(LINUXINCLUDE)
 # Calculate the load address of the compressed kernel image
 hostprogs := calc_vmlinuz_load_addr
 
+ifneq (0x0,$(CONFIG_ZBOOT_LOAD_ADDRESS))
+zload-y        = $(CONFIG_ZBOOT_LOAD_ADDRESS)
+endif
+
 ifneq ($(zload-y),)
 VMLINUZ_LOAD_ADDRESS := $(zload-y)
 else

diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform
index d7c8cff6de2cc44027f458499a4b9f5373f91300..0c03623f38970f25fa4021424d8a302603548d7e 100644 (file)
--- a/arch/mips/generic/Platform
+++ b/arch/mips/generic/Platform
@@ -13,7 +13,6 @@ cflags-$(CONFIG_MACH_INGENIC_SOC)     += -I$(srctree)/arch/mips/include/asm/mach-ing
 cflags-$(CONFIG_MIPS_GENERIC)  += -I$(srctree)/arch/mips/include/asm/mach-generic
 
 load-$(CONFIG_MIPS_GENERIC)    += 0xffffffff80100000
-zload-$(CONFIG_MIPS_GENERIC)   += 0xffffffff81000000
 all-$(CONFIG_MIPS_GENERIC)     += vmlinux.gz.itb
 
 its-y                                  := vmlinux.its.S