[PATCH 0/2] sunxi: CONFIG_SYS_MMC_ENV_DEV undeclared
When enabling CONFIG_ENV_IS_IN_EXT4 the environment might be stored on an mmc device similar to the CONFIG_ENV_IS_IN_FAT case. Enable CONFIG_SYS_MMC_ENV_DEV in this case.
bananapi_m64_defconfig with CONFIG_ENV_IS_NOWHERE results in:
board/sunxi/board.c: In function 'mmc_get_env_dev': board/sunxi/board.c:535:24: error: 'CONFIG_SYS_MMC_ENV_DEV' undeclared (first use in this function) 535 | return CONFIG_SYS_MMC_ENV_DEV; | ^~~~~~~~~~~~~~~~~~~~~~
Check if CONFIG_SYS_MMC_ENV_DEV is defined.
Heinrich Schuchardt (2): env: ENV_IS_IN_EXT4 should enable SYS_MMC_ENV_DEV sunxi: CONFIG_SYS_MMC_ENV_DEV undeclared
board/sunxi/board.c | 2 +- env/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
When enabling CONFIG_ENV_IS_IN_EXT4 the environment might be stored on an mmc device similar to the CONFIG_ENV_IS_IN_FAT case.
Fixes: 7d080773347c ("Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com --- env/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/env/Kconfig b/env/Kconfig index 7885c8bf831..b87d8f8dea8 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -655,7 +655,7 @@ config SYS_RELOC_GD_ENV_ADDR
config SYS_MMC_ENV_DEV int "mmc device number" - depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || \ + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || ENV_IS_IN_EXT4 || \ CMD_MVEBU_BUBT || FMAN_ENET || QE || PHY_CORTINA default 0 help
bananapi_m64_defconfig with CONFIG_ENV_IS_NOWHERE results in:
board/sunxi/board.c: In function 'mmc_get_env_dev': board/sunxi/board.c:535:24: error: 'CONFIG_SYS_MMC_ENV_DEV' undeclared (first use in this function) 535 | return CONFIG_SYS_MMC_ENV_DEV; | ^~~~~~~~~~~~~~~~~~~~~~
Check if CONFIG_SYS_MMC_ENV_DEV is defined.
Fixes: 1011ebc72bda ("sunxi: Select environment MMC based on boot device") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com --- board/sunxi/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 8c12c8deade..c849bbe8267 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -523,7 +523,7 @@ int board_mmc_init(struct bd_info *bis) return 0; }
-#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1 +#ifdef CONFIG_SYS_MMC_ENV_DEV int mmc_get_env_dev(void) { switch (sunxi_get_boot_device()) {
participants (1)
-
Heinrich Schuchardt