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 <[email protected]> --- Cc: Ilias Apalodimas <[email protected]> Cc: Raymond Mao <[email protected]> --- lib/fdtdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index b91e067106dd..ecb22a58b964 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1856,7 +1856,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; -- 2.43.0
