sunxi: Select environment MMC based on boot device

Currently, the environment is always stored in eMMC if eMMC is enabled
in the config. This means images written to SD and eMMC will cross-
contaminate their environments unless the configuration is changed.

By dropping the device number from the environment location string and
implementing mmc_get_env_dev, we will always use the environment from
the boot device when booting from SD/eMMC.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 67acc01d83ade6eb85c7df1d752087ff898cacce..1a46100e408d4f3a959a0ce175976781dec9a6eb 100644 (file)
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -636,6 +636,20 @@ int board_mmc_init(struct bd_info *bis)
 
        return 0;
 }
+
+#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
+int mmc_get_env_dev(void)
+{
+       switch (sunxi_get_boot_device()) {
+       case BOOT_DEVICE_MMC1:
+               return 0;
+       case BOOT_DEVICE_MMC2:
+               return 1;
+       default:
+               return CONFIG_SYS_MMC_ENV_DEV;
+       }
+}
+#endif
 #endif
 
 #ifdef CONFIG_SPL_BUILD

diff --git a/env/Kconfig b/env/Kconfig
index 691f4d480cc417353319df3bd7c7bfd2689ba7cb..67ff172e3a9b69fc18ea6ad9fd6b4f7e0c118ffd 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -446,8 +446,7 @@ config ENV_FAT_DEVICE_AND_PART
        depends on ENV_IS_IN_FAT
        default "0:1" if TI_COMMON_CMD_OPTIONS
        default "0:auto" if ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
-       default "0:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
-       default "1:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+       default ":auto" if ARCH_SUNXI
        default "0" if ARCH_AT91
        help
          Define this to a string to specify the partition of the device. It can