[PATCH master 2/4] ARM: Layerscape: fix compilation of LS1028 without LS1046

[Sascha Hauer]

On Tue, Apr 22, 2025 at 09:55:17AM +0200, Ahmad Fatoum wrote:
> From: Ahmad Fatoum <a.fatoum at barebox.org>
> 
> Definitions inside icid.c are needed for both LS1046 and LS1028, so make
> sure it's compiled unconditionally.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum at barebox.org>
> ---
>  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.

Sascha

-------------------------------8<------------------------------

>From bb416fc27329e04935dc45b76a5e853583272783 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer at pengutronix.de>
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 <s.hauer at pengutronix.de>
---
 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
-- 
2.39.5


-- 
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 |