diff options
| author | YunQiang Su <yunqiang.su@cipunited.com> | 2021-12-22 13:43:46 +0000 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2022-01-02 14:17:30 +0100 |
| commit | 79876cc1d7b801b28511440e5aec1b31d8df7a73 (patch) | |
| tree | d1005b5f938ecf86a493b8aa9030f50e4c77de5f /arch/mips/boot | |
| parent | 31b2f3dc851c65fee288612432c4fc956f1a264e (diff) | |
| download | linux-stable-79876cc1d7b801b28511440e5aec1b31d8df7a73.tar.gz linux-stable-79876cc1d7b801b28511440e5aec1b31d8df7a73.tar.bz2 linux-stable-79876cc1d7b801b28511440e5aec1b31d8df7a73.zip | |
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>
Diffstat (limited to 'arch/mips/boot')
| -rw-r--r-- | arch/mips/boot/compressed/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile index f27cf31b4140..85d5082db917 100644 --- 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 |