| Message ID | 20220306151648.39599-1-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 34275ac292ae141ebc1296b72f005f71b25998a7 |
| Headers | show |
| Series | mips: Always permit to build u-boot images | expand |
On Sun, Mar 06, 2022 at 03:16:48PM +0000, Paul Cercueil wrote: > 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 79876cc1d7b8 ("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: 79876cc1d7b8 ("MIPS: new Kconfig option ZBOOT_LOAD_ADDRESS") > Cc: <stable@vger.kernel.org> > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > arch/mips/Makefile | 4 ---- > 1 file changed, 4 deletions(-) applied to mips-next. Thomas.
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index e036fc025ccc..4478c5661d61 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -340,14 +340,12 @@ drivers-$(CONFIG_PM) += arch/mips/power/ boot-y := vmlinux.bin boot-y += vmlinux.ecoff boot-y += vmlinux.srec -ifeq ($(shell expr $(load-y) \< 0xffffffff80000000 2> /dev/null), 0) boot-y += uImage boot-y += uImage.bin boot-y += uImage.bz2 boot-y += uImage.gz boot-y += uImage.lzma boot-y += uImage.lzo -endif boot-y += vmlinux.itb boot-y += vmlinux.gz.itb boot-y += vmlinux.bz2.itb @@ -359,9 +357,7 @@ bootz-y := vmlinuz bootz-y += vmlinuz.bin bootz-y += vmlinuz.ecoff bootz-y += vmlinuz.srec -ifeq ($(shell expr $(zload-y) \< 0xffffffff80000000 2> /dev/null), 0) bootz-y += uzImage.bin -endif bootz-y += vmlinuz.itb #
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 79876cc1d7b8 ("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: 79876cc1d7b8 ("MIPS: new Kconfig option ZBOOT_LOAD_ADDRESS") Cc: <stable@vger.kernel.org> Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- arch/mips/Makefile | 4 ---- 1 file changed, 4 deletions(-)