[PATCH 04/10] arm: dts: imx8m: Require ATF BL31 blob only if not PSCI provider

Marek Vasut
2022-12-22T00:47:43Z

In case U-Boot itself if the PSCI provider on i.MX8M, do not
require the ATF BL31 blob, as at that point the blob is useless
and would interfere with U-Boot operation.

Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: "Ariel D'Alessandro" <ariel.dalessandro@collabora.com>
Cc: "NXP i.MX U-Boot Team" <uboot-imx@nxp.com>
Cc: "Ying-Chun Liu (PaulLiu)" <paul.liu@linaro.org>
Cc: Adam Ford <aford173@gmail.com>
Cc: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Manoj Sai <abbaraju.manojsai@amarulasolutions.com>
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Ricardo Salveti <ricardo@foundries.io>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Tim Harvey <tharvey@gateworks.com>
Cc: Ye Li <ye.li@nxp.com>
---
arch/arm/dts/imx8mm-u-boot.dtsi | 4 ++++
arch/arm/dts/imx8mn-u-boot.dtsi | 4 ++++
arch/arm/dts/imx8mp-u-boot.dtsi | 4 ++++
arch/arm/dts/imx8mq-u-boot.dtsi | 4 ++++
4 files changed, 16 insertions(+)

diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 60d49bc3d7b..25dc8e12dde 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -99,6 +99,7 @@
};
};

+#ifndef CONFIG_ARMV8_PSCI
atf {
arch = "arm64";
compression = "none";
@@ -112,6 +113,7 @@
type = "atf-bl31";
};
};
+#endif

binman_fip: fip {
arch = "arm64";
@@ -140,7 +142,9 @@
description = "NAME";
fdt = "fdt-SEQ";
firmware = "uboot";
+#ifndef CONFIG_ARMV8_PSCI
loadables = "atf";
+#endif
};
};
};
diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
index 95f45ad2522..b019b2341d6 100644
--- a/arch/arm/dts/imx8mn-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-u-boot.dtsi
@@ -161,6 +161,7 @@
};
};

+#ifndef CONFIG_ARMV8_PSCI
atf {
arch = "arm64";
compression = "none";
@@ -174,6 +175,7 @@
type = "atf-bl31";
};
};
+#endif

binman_fip: fip {
arch = "arm64";
@@ -202,7 +204,9 @@
description = "NAME";
fdt = "fdt-SEQ";
firmware = "uboot";
+#ifndef CONFIG_ARMV8_PSCI
loadables = "atf";
+#endif
};
};
};
diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index f9883aa1336..9a3de8f6a07 100644
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -120,6 +120,7 @@
};
};

+#ifndef CONFIG_ARMV8_PSCI
atf {
description = "ARM Trusted Firmware";
type = "firmware";
@@ -133,6 +134,7 @@
type = "atf-bl31";
};
};
+#endif

@fdt-SEQ {
description = "NAME";
@@ -152,7 +154,9 @@
description = "NAME";
fdt = "fdt-SEQ";
firmware = "uboot";
+#ifndef CONFIG_ARMV8_PSCI
loadables = "atf";
+#endif
};
};
};
diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index 8d385e8da4f..2bc9f413da0 100644
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -114,6 +114,7 @@
};
};

+#ifndef CONFIG_ARMV8_PSCI
atf {
arch = "arm64";
compression = "none";
@@ -127,6 +128,7 @@
type = "blob-ext";
};
};
+#endif

fdt {
compression = "none";
@@ -147,7 +149,9 @@
description = "NAME";
fdt = "fdt";
firmware = "uboot";
+#ifndef CONFIG_ARMV8_PSCI
loadables = "atf";
+#endif
};
};
};
--
2.35.1