public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Hendrik Donner <hd@os-cillation.de>
To: u-boot@lists.denx.de
Cc: Hendrik Donner <hd@os-cillation.de>,
	Stefano Babic <sbabic@denx.de>,
	Fabio Estevam <festevam@gmail.com>,
	"NXP i.MX U-Boot Team" <uboot-imx@nxp.com>,
	Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>
Subject: [PATCH 1/2] imx8qxp: Do not use CONFIG_XPL_BUILD in device tree
Date: Fri, 14 Mar 2025 21:08:31 +0100	[thread overview]
Message-ID: <20250314200832.154758-2-hd@os-cillation.de> (raw)
In-Reply-To: <20250314200832.154758-1-hd@os-cillation.de>

In c9713c155127 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.

Fixes: c9713c155127 ("imx8-u-boot: Fix SPL guard option")
Signed-off-by: Hendrik Donner <hd@os-cillation.de>
---
 arch/arm/dts/imx8qxp-u-boot.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/imx8qxp-u-boot.dtsi b/arch/arm/dts/imx8qxp-u-boot.dtsi
index 8058caae9ba..db6a3dedb95 100644
--- a/arch/arm/dts/imx8qxp-u-boot.dtsi
+++ b/arch/arm/dts/imx8qxp-u-boot.dtsi
@@ -10,7 +10,7 @@
 };
 
 &binman {
-#ifdef CONFIG_XPL_BUILD
+#ifdef CONFIG_SPL
 	u-boot-spl-ddr {
 		align = <4>;
 		align-size = <4>;
@@ -120,7 +120,7 @@
 		};
 	};
 
-#ifdef CONFIG_XPL_BUILD
+#ifdef CONFIG_SPL
 	imx-boot {
 		filename = "flash.bin";
 		pad-byte = <0x00>;
-- 
2.43.0


  reply	other threads:[~2025-03-14 20:09 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-05 18:35 [PATCH 0/2] Build fixes for CONFIG_XPL_BUILD in dts files Hendrik Donner
2025-03-05 18:35 ` [PATCH 1/2] imx8qm: Fix build when using SPL Hendrik Donner
2025-03-05 18:35 ` [PATCH 2/2] Makefile.lib: Set xPL build related defines for DTB build Hendrik Donner
2025-03-06 10:18   ` Quentin Schulz
2025-03-06 10:22     ` Oliver Graute
2025-03-06 16:28     ` Hendrik Donner
2025-03-06 17:40       ` Quentin Schulz
2025-03-14 20:08         ` [PATCH 0/2] Do not use CONFIG_XPL_BUILD in device tree Hendrik Donner
2025-03-14 20:08           ` Hendrik Donner [this message]
2025-03-15 11:58             ` [PATCH 1/2] imx8qxp: " Fabio Estevam
2025-03-17 11:10               ` Quentin Schulz
2025-03-17 12:41                 ` Hendrik Donner
2025-03-17 13:40                 ` Tom Rini
2025-03-14 20:08           ` [PATCH 2/2] imx8qm: " Hendrik Donner
2025-03-06 17:56       ` [PATCH 2/2] Makefile.lib: Set xPL build related defines for DTB build Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250314200832.154758-2-hd@os-cillation.de \
    --to=hd@os-cillation.de \
    --cc=festevam@gmail.com \
    --cc=sbabic@denx.de \
    --cc=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    --cc=uboot-imx@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox