From nobody Tue Jun 23 12:19:24 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84BFBC433FE for ; Sun, 6 Mar 2022 15:17:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233705AbiCFPRw (ORCPT ); Sun, 6 Mar 2022 10:17:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233687AbiCFPRv (ORCPT ); Sun, 6 Mar 2022 10:17:51 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 499473FBEC; Sun, 6 Mar 2022 07:16:57 -0800 (PST) From: Paul Cercueil To: Thomas Bogendoerfer Cc: YunQiang Su , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, od@opendingux.net, Paul Cercueil , stable@vger.kernel.org Subject: [PATCH] mips: Always permit to build u-boot images Date: Sun, 6 Mar 2022 15:16:48 +0000 Message-Id: <20220306151648.39599-1-paul@crapouillou.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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: Signed-off-by: Paul Cercueil --- arch/mips/Makefile | 4 ---- 1 file changed, 4 deletions(-) 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) +=3D arch/mips/power/ boot-y :=3D vmlinux.bin boot-y +=3D vmlinux.ecoff boot-y +=3D vmlinux.srec -ifeq ($(shell expr $(load-y) \< 0xffffffff80000000 2> /dev/null), 0) boot-y +=3D uImage boot-y +=3D uImage.bin boot-y +=3D uImage.bz2 boot-y +=3D uImage.gz boot-y +=3D uImage.lzma boot-y +=3D uImage.lzo -endif boot-y +=3D vmlinux.itb boot-y +=3D vmlinux.gz.itb boot-y +=3D vmlinux.bz2.itb @@ -359,9 +357,7 @@ bootz-y :=3D vmlinuz bootz-y +=3D vmlinuz.bin bootz-y +=3D vmlinuz.ecoff bootz-y +=3D vmlinuz.srec -ifeq ($(shell expr $(zload-y) \< 0xffffffff80000000 2> /dev/null), 0) bootz-y +=3D uzImage.bin -endif bootz-y +=3D vmlinuz.itb =20 # --=20 2.34.1