From: Simon Glass <sjg@chromium.org>
Date: Sun, 5 Feb 2023 22:40:14 +0000 (-0700)
Subject: Correct SPL uses of MICROBLAZE
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=0c22cdca1500470d9c750565361e423bd8e6c14f;p=u-boot.git

Correct SPL uses of MICROBLAZE

This converts 2 usages of this option to the non-SPL form, since there is
no SPL_MICROBLAZE 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 aa9f3ef071..bed1531993 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -412,14 +412,14 @@ int board_late_init_xilinx(void)
 	struct xilinx_board_description *desc;
 	phys_size_t bootm_size = gd->ram_top - gd->ram_base;
 
-	if (!CONFIG_IS_ENABLED(MICROBLAZE)) {
+	if (!IS_ENABLED(CONFIG_MICROBLAZE)) {
 		ulong scriptaddr;
 
 		scriptaddr = env_get_hex("scriptaddr", 0);
 		ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr);
 	}
 
-	if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE))
+	if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || IS_ENABLED(CONFIG_MICROBLAZE))
 		bootm_size = min(bootm_size, (phys_size_t)(SZ_512M + SZ_256M));
 
 	ret |= env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET);