[PATCH 2/2] imx8qm: Do not use CONFIG_XPL_BUILD in device tree

[Hendrik Donner]

In c9713c15512 the device tree was moved
from CONFIG_SPL to CONFIG_SPL_BUILD and later to CONFIG_XPL_BUILD, but
the CONFIG_xPL_BUILD defines are never set for device trees, breaking
the build. Move the guards back to CONFIG_SPL.

Also add a missing guard analog to 645a42d7ee8 to fix a similar build
issue.

Fixes: c9713c15512 ("imx8-u-boot: Fix SPL guard option")
Signed-off-by: Hendrik Donner <hd at os-cillation.de>
---
 arch/arm/dts/imx8qm-u-boot.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi
index af229501a4d..8492b3f4c78 100644
--- a/arch/arm/dts/imx8qm-u-boot.dtsi
+++ b/arch/arm/dts/imx8qm-u-boot.dtsi
@@ -10,7 +10,7 @@
 };
 
 &binman {
-#ifdef CONFIG_XPL_BUILD
+#ifdef CONFIG_SPL
 	u-boot-spl-ddr {
 		align = <4>;
 		align-size = <4>;
@@ -122,6 +122,7 @@
 		};
 	};
 
+#ifdef CONFIG_SPL
 	imx-boot {
 		filename = "flash.bin";
 		pad-byte = <0x00>;
@@ -132,4 +133,5 @@
 			type = "blob-ext";
 		};
 	};
+#endif
 };
-- 
2.43.0