]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Correct SPL uses of ENV_IS_IN_UBI
authorSimon Glass <sjg@chromium.org>
Sun, 5 Feb 2023 22:39:48 +0000 (15:39 -0700)
committerTom Rini <trini@konsulko.com>
Thu, 9 Feb 2023 21:32:26 +0000 (16:32 -0500)
This converts 2 usages of this option to the non-SPL form, since there is
no SPL_ENV_IS_IN_UBI defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
board/engicam/stm32mp1/stm32mp1.c
board/st/stm32mp1/stm32mp1.c

index 0a3e580f5b44759e517fd1cdd940bcd5b7516b3e..5223e9bae8d7733b0f3f454cef44126be602ce83 100644 (file)
@@ -68,7 +68,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
 
        case BOOT_FLASH_NAND:
        case BOOT_FLASH_SPINAND:
-               if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI))
+               if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI))
                        return ENVL_UBI;
                else
                        return ENVL_NOWHERE;
index ec6f0b43f2870f26922a3fa44289d8a9fcd9b134..1318ba8951a2801054267df248db44a537556f62 100644 (file)
@@ -831,7 +831,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
 
        case BOOT_FLASH_NAND:
        case BOOT_FLASH_SPINAND:
-               if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI))
+               if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI))
                        return ENVL_UBI;
                else
                        return ENVL_NOWHERE;