arm: dts: imx8m: Require ATF BL31 blob only if not PSCI provider

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>

diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 60d49bc3d7bfde18ec79a536216cf062fd2c33dc..25dc8e12ddedf8a703ee77832ef9f52b59f18b7b 100644 (file)
--- 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 ec53390afb30f79b0c12189af1a6fc8d13cc7c2b..d55dddbdb6e71790fe90fee95b521ab8ddfa1034 100644 (file)
--- a/arch/arm/dts/imx8mn-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-u-boot.dtsi
@@ -163,6 +163,7 @@
                                        };
                                };
 
+#ifndef CONFIG_ARMV8_PSCI
                                atf {
                                        arch = "arm64";
                                        compression = "none";
@@ -176,6 +177,7 @@
                                                type = "atf-bl31";
                                        };
                                };
+#endif
 
                                binman_fip: fip {
                                        arch = "arm64";
@@ -204,7 +206,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 cb9b5b649a04f857979ea1f2bedb41889b28093b..07538da621471bec1bf246332294132b78850e19 100644 (file)
--- 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 8d385e8da4f834b9c0c266b78fa0f8b0f7442ec8..2bc9f413da09f0f548846fbacc949bc49b6efe59 100644 (file)
--- 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
                                };
                        };
                };