[PATCH 046/171] Correct SPL uses of CMD_FDT

Simon Glass sjg at chromium.org
Mon Jan 30 15:41:19 CET 2023


This converts 2 usages of this option to the non-SPL form, since there is
no SPL_CMD_FDT defined in Kconfig

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

 boot/bootm.c     | 2 +-
 boot/image-fdt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/bootm.c b/boot/bootm.c
index 56b82bbb8b7..2eec60ec7b5 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -313,7 +313,7 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start,
 		return 1;
 	}
 
-	if (CONFIG_IS_ENABLED(CMD_FDT))
+	if (IS_ENABLED(CONFIG_CMD_FDT))
 		set_working_fdt_addr(map_to_sysmem(images.ft_addr));
 #endif
 
diff --git a/boot/image-fdt.c b/boot/image-fdt.c
index b830a0ab418..408abce096f 100644
--- a/boot/image-fdt.c
+++ b/boot/image-fdt.c
@@ -272,7 +272,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
 	*of_flat_tree = of_start;
 	*of_size = of_len;
 
-	if (CONFIG_IS_ENABLED(CMD_FDT))
+	if (IS_ENABLED(CONFIG_CMD_FDT))
 		set_working_fdt_addr(map_to_sysmem(*of_flat_tree));
 	return 0;
 
-- 
2.39.1.456.gfc5497dd1b-goog



More information about the U-Boot mailing list