[PATCH] board: stm32mp1: solve compilation issue when ENV_IS_IN_MMC is deactivated
Patrick Delaunay
patrick.delaunay at foss.st.com
Tue Jan 11 16:37:21 CET 2022
Solve compilation issue on undefined CONFIG_SYS_MMC_ENV_DEV when
CONFIG_ENV_IS_IN_MMC is deactivated on STMicroelectronics boards
defconfig
Fixes: 9f97193616f1 ("board: stm32mp1: use CONFIG_SYS_MMC_ENV_DEV when available")
Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
---
board/st/stm32mp1/stm32mp1.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 45f2ca81a6..fff1880e5b 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -890,8 +890,10 @@ const char *env_ext4_get_dev_part(void)
int mmc_get_env_dev(void)
{
- if (CONFIG_SYS_MMC_ENV_DEV >= 0)
- return CONFIG_SYS_MMC_ENV_DEV;
+ const int mmc_env_dev = CONFIG_IS_ENABLED(ENV_IS_IN_MMC, (CONFIG_SYS_MMC_ENV_DEV), (-1));
+
+ if (mmc_env_dev >= 0)
+ return mmc_env_dev;
/* use boot instance to select the correct mmc device identifier */
return mmc_get_boot();
--
2.25.1
More information about the U-Boot
mailing list