From: Simon Glass <sjg@chromium.org>
Date: Fri, 17 Dec 2021 03:59:29 +0000 (-0700)
Subject: fdt: Drop OF_CONTROL check in fdtdec_setup()
X-Git-Tag: v2022.07~227^2~12^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5199380fc993174a795994f00ef3d67e60142c1;p=platform%2Fkernel%2Fu-boot.git

fdt: Drop OF_CONTROL check in fdtdec_setup()

This function should only be called when OF_CONTROL is enabled. It
fails in fdtdec_prepare_fdt() anyway, since gd->fdt_blob stays as NULL
if OF_CONTROL is not enabled.

Drop this useless check.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 659aeff..5b31064 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1624,16 +1624,15 @@ static void setup_multi_dtb_fit(void)
 int fdtdec_setup(void)
 {
 	int ret;
-#if CONFIG_IS_ENABLED(OF_CONTROL)
-# ifdef CONFIG_OF_EMBED
+#ifdef CONFIG_OF_EMBED
 	/* Get a pointer to the FDT */
 	gd->fdt_blob = dtb_dt_embedded();
-# elif defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE)
+#elif defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE)
 	/* Allow the board to override the fdt address. */
 	gd->fdt_blob = board_fdt_blob_setup(&ret);
 	if (ret)
 		return ret;
-# endif
+#endif
 	if (!IS_ENABLED(CONFIG_SPL_BUILD)) {
 		/* Allow the early environment to override the fdt address */
 		gd->fdt_blob = map_sysmem(env_get_ulong("fdtcontroladdr", 16,
@@ -1642,7 +1641,6 @@ int fdtdec_setup(void)
 
 	if (CONFIG_IS_ENABLED(MULTI_DTB_FIT))
 		setup_multi_dtb_fit();
-#endif
 
 	ret = fdtdec_prepare_fdt();
 	if (!ret)