From 0f44d5549ed814744b95b2450fbacfa14192587d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 9 Jun 2025 21:26:39 +0200 Subject: env: Rename SYS_MMC_ENV_DEV to ENV_MMC_DEVICE_INDEX Rename the variable and add ENV_ prefix, so that all configuration options which are related to environment would have an CONFIG_ENV_ prefix. No functional change. Use ENV_MMC_DEVICE_INDEX to clarify this is the SD/MMC device index, a number, as enumerated by U-Boot. Update the help text accordingly. Signed-off-by: Marek Vasut --- env/Kconfig | 10 ++++++---- env/mmc.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'env') diff --git a/env/Kconfig b/env/Kconfig index e551ffe45c3..1decdd89648 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -215,7 +215,7 @@ config ENV_IS_IN_MMC Define this if you have an MMC device which you want to use for the environment. - CONFIG_SYS_MMC_ENV_DEV: + CONFIG_ENV_MMC_DEVICE_INDEX: Specifies which MMC device the environment is stored in. @@ -698,13 +698,15 @@ config ENV_MTD_DEV help MTD device name on the platform where the environment is stored. -config SYS_MMC_ENV_DEV - int "mmc device number" +config ENV_MMC_DEVICE_INDEX + int "SD/MMC device index" 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 - MMC device number on the platform where the environment is stored. + SD/MMC device index on the platform where the environment is stored. + The index is often derived from DT aliases mmcN node ordering, and + matches the 'mmc list' command output. config SYS_MMC_ENV_PART int "mmc partition number" diff --git a/env/mmc.c b/env/mmc.c index 5451f914027..dba99bd4d3d 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -164,7 +164,7 @@ static inline s64 mmc_offset(struct mmc *mmc, int copy) #if defined(CONFIG_ENV_MMC_PARTITION) str = CONFIG_ENV_MMC_PARTITION; #else - /* look for the partition in mmc CONFIG_SYS_MMC_ENV_DEV */ + /* look for the partition in mmc CONFIG_ENV_MMC_DEVICE_INDEX */ str = ofnode_conf_read_str(dt_prop.partition); #endif -- cgit v1.2.3