From: Simon Glass <sjg@chromium.org>
Date: Sun, 5 Feb 2023 22:39:38 +0000 (-0700)
Subject: Correct SPL uses of DTB_RESELECT
X-Git-Url: http://git.dujemihanovic.xyz/html/index.html?a=commitdiff_plain;h=866ec874f52596229e072575b13ddabd3c73fb83;p=u-boot.git

Correct SPL uses of DTB_RESELECT

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

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

diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 3dea238466..35a2f310f4 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -208,7 +208,7 @@ static int xilinx_read_eeprom_fru(struct udevice *dev, char *name,
 	}
 
 	fru_capture((unsigned long)fru_content);
-	if (gd->flags & GD_FLG_RELOC || (_DEBUG && CONFIG_IS_ENABLED(DTB_RESELECT))) {
+	if (gd->flags & GD_FLG_RELOC || (_DEBUG && IS_ENABLED(CONFIG_DTB_RESELECT))) {
 		printf("Xilinx I2C FRU format at %s:\n", name);
 		ret = fru_display(0);
 		if (ret) {
@@ -501,7 +501,7 @@ int __maybe_unused board_fit_config_name_match(const char *name)
 	return -1;
 }
 
-#if CONFIG_IS_ENABLED(DTB_RESELECT)
+#if IS_ENABLED(CONFIG_DTB_RESELECT)
 #define MAX_NAME_LENGTH	50
 
 char * __maybe_unused __weak board_name_decode(void)