[PATCH 081/171] Correct SPL uses of ENV_IS_IN_UBI

Simon Glass
2023-01-30T15:13:53Z

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 | 2 +-
board/st/stm32mp1/stm32mp1.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/engicam/stm32mp1/stm32mp1.c b/board/engicam/stm32mp1/stm32mp1.c
index 0a3e580f5b4..5223e9bae8d 100644
--- a/board/engicam/stm32mp1/stm32mp1.c
+++ b/board/engicam/stm32mp1/stm32mp1.c
@@ -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;
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index b9fc240d5b6..7cff9e3d860 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -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;
--
2.39.1.456.gfc5497dd1b-goog