From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 22 Apr 2025 17:35:47 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1u7Ff1-0046d3-2p for lore@lore.pengutronix.de; Tue, 22 Apr 2025 17:35:47 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1u7Ff1-0005FB-6t for lore@pengutronix.de; Tue, 22 Apr 2025 17:35:47 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Tr1Q99Qtb2HG/jPPvxz3VOH75ZjznwtSrOEojmXpQ4Y=; b=t/MT8BUntn+OBAjlInaIJDxq4J MbfMlIfXpk3PXFhPJ62S7eBBU0bH+7HxQTzzk3LE3XIgSY/3UoSDF5aY2/klEf4mdCFsHmjGaSK4e FoS4TDQId37yMbeaQObKPJxT4PSjh4ewU3AX9dcNnuNRDyl4AnKDkRAh9zyLy1bcOTgY2CwPmIyH3 CEMk+OD9hyZEeoKgGRJjobeq+QaiTdk19ZxMdJdM8/TmzoLj5COCn3xWbazos9fK98+XJV0rQeSz1 mbFU60yYFj/RbhFB6FeC1l3EH6WnRhmJCMBciF64WOrbEyNNQuoFs7l+rNoYux9Aehx0liASYeay5 J0QkVC4Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u7FeW-00000007kAj-2xEP; Tue, 22 Apr 2025 15:35:16 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u7ESF-00000007SeV-3zS9 for barebox@lists.infradead.org; Tue, 22 Apr 2025 14:18:33 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1u7ESE-0005Uc-Oj; Tue, 22 Apr 2025 16:18:30 +0200 Message-ID: <527c368d-fa4e-4afd-9d78-d6e1ef0ac392@pengutronix.de> Date: Tue, 22 Apr 2025 16:18:30 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Sascha Hauer Cc: barebox@lists.infradead.org References: <20250422075519.219029-1-a.fatoum@pengutronix.de> <20250422075519.219029-2-a.fatoum@pengutronix.de> Content-Language: en-US, de-DE, de-BE From: Ahmad Fatoum In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250422_071831_992932_87862FE0 X-CRM114-Status: GOOD ( 26.33 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.4 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH master 2/4] ARM: Layerscape: fix compilation of LS1028 without LS1046 X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Hello Sascha, On 4/22/25 16:14, Sascha Hauer wrote: > On Tue, Apr 22, 2025 at 09:55:17AM +0200, Ahmad Fatoum wrote: >> From: Ahmad Fatoum >> >> Definitions inside icid.c are needed for both LS1046 and LS1028, so make >> sure it's compiled unconditionally. >> >> Signed-off-by: Ahmad Fatoum >> --- >> arch/arm/mach-layerscape/Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/mach-layerscape/Makefile b/arch/arm/mach-layerscape/Makefile >> index 10e1c031b953..095d3e4eae57 100644 >> --- a/arch/arm/mach-layerscape/Makefile >> +++ b/arch/arm/mach-layerscape/Makefile >> @@ -3,7 +3,7 @@ >> obj- := __dummy__.o >> lwl-y += errata.o >> lwl-$(CONFIG_ARCH_LS1046) += lowlevel.o lowlevel-ls1046a.o >> -obj-$(CONFIG_ARCH_LS1046) += icid.o >> +obj-y += icid.o > > This breaks compilation of layerscape_v7_defconfig. icic.c must not be > compiled for LS1021. I fixed this with the following. Thanks. I briefly thought ls1028 was the 32-bit platform, but of course that doesn't make sense, because I was compiling for 64-bit when I ran into the error... I see now that there are a couple other issues reported by CI. Should I look into all of them? Just want to ensure that we don't do the work twice. Cheers, Ahmad > > Sascha > > -------------------------------8<------------------------------ > > From bb416fc27329e04935dc45b76a5e853583272783 Mon Sep 17 00:00:00 2001 > From: Sascha Hauer > Date: Tue, 22 Apr 2025 16:00:56 +0200 > Subject: [PATCH] ARM: Layerscape: fix icid compilation for 32bit layerscape > > icid.c has to be compiled for LS1028 and LS1046a, but not for LS1021. > Introduce an extra Kconfig symbol selected from the SoCs that need it. > > Fixes: 7458e41a4c98 ("ARM: Layerscape: fix compilation of LS1028 without LS1046") > Signed-off-by: Sascha Hauer > --- > arch/arm/mach-layerscape/Kconfig | 5 +++++ > arch/arm/mach-layerscape/Makefile | 2 +- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-layerscape/Kconfig b/arch/arm/mach-layerscape/Kconfig > index 0f559863ec..c24f948c1d 100644 > --- a/arch/arm/mach-layerscape/Kconfig > +++ b/arch/arm/mach-layerscape/Kconfig > @@ -2,18 +2,23 @@ > > if ARCH_LAYERSCAPE > > +config ARCH_LAYERSCAPE_ICID > + bool > + > config ARCH_LS1028 > bool > select CPU_V8 > select SYS_SUPPORTS_64BIT_KERNEL > select ARM_ATF > select FIRMWARE_LS1028A_ATF > + select ARCH_LAYERSCAPE_ICID > > config ARCH_LS1046 > bool > select CPU_V8 > select ARM_ATF > select SYS_SUPPORTS_64BIT_KERNEL > + select ARCH_LAYERSCAPE_ICID > > if 64BIT > > diff --git a/arch/arm/mach-layerscape/Makefile b/arch/arm/mach-layerscape/Makefile > index 095d3e4eae..e49701bf18 100644 > --- a/arch/arm/mach-layerscape/Makefile > +++ b/arch/arm/mach-layerscape/Makefile > @@ -3,7 +3,7 @@ > obj- := __dummy__.o > lwl-y += errata.o > lwl-$(CONFIG_ARCH_LS1046) += lowlevel.o lowlevel-ls1046a.o > -obj-y += icid.o > +obj-$(CONFIG_ARCH_LAYERSCAPE_ICID) += icid.o > obj-pbl-y += boot.o soc.o > pbl-y += xload-qspi.o xload.o > pbl-$(CONFIG_ARCH_LS1028) += tzc400.o -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |