From 427d6111d327428a450243361b23956b3b3f17a4 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Tue, 6 Jan 2026 12:47:10 -0600
Subject: [PATCH] lib/fdtdec.c: Disallow overriding the fdt address with
 mandatory passage

When we have CONFIG_BLOBLIST_PASSAGE_MANDATORY don't allow the device
tree address to be overridden. The device tree we're given is the one
that must be used.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Cc: Raymond Mao <raymondmaoca@gmail.com>
---
 lib/fdtdec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index c67b6e8c133..8b8823ca31d 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1860,7 +1860,8 @@ int fdtdec_setup(void)
 	}
 
 	/* Allow the board to override the fdt address. */
-	if (IS_ENABLED(CONFIG_OF_BOARD)) {
+	if (IS_ENABLED(CONFIG_OF_BOARD) &&
+	    !IS_ENABLED(CONFIG_BLOBLIST_PASSAGE_MANDATORY)) {
 		void *blob;
 
 		blob = (void *)gd->fdt_blob;