]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Correct SPL uses of MICROBLAZE
authorSimon Glass <sjg@chromium.org>
Sun, 5 Feb 2023 22:40:14 +0000 (15:40 -0700)
committerTom Rini <trini@konsulko.com>
Fri, 10 Feb 2023 12:41:39 +0000 (07:41 -0500)
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>
board/xilinx/common/board.c

index aa9f3ef071c2a83bb8ecaefc86d3f4fd4ce11e22..bed15319934e60947c787d736dd8708a64f7863e 100644 (file)
@@ -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);