diff options
| author | Marek Vasut <marek.vasut+renesas@mailbox.org> | 2025-06-09 21:26:40 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-06-20 12:15:08 -0600 |
| commit | 31617b880ab7da6aade0cf3c07f0d02b42bb8f4c (patch) | |
| tree | aa4fed1ca31cbed2a93c145064314a5aeff4966c /env | |
| parent | 0f44d5549ed814744b95b2450fbacfa14192587d (diff) | |
env: Rename SYS_MMC_ENV_PART to ENV_MMC_EMMC_HW_PARTITION
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_EMMC_HW_PARTITION to clarify this is the eMMC hardware
partition selector, not a software partition table entry selector.
Retain the ENV_MMC_ prefix to make it easier to search for all the
SD/MMC related ENV options. Update the help text accordingly.
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 8 | ||||
| -rw-r--r-- | env/mmc.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/env/Kconfig b/env/Kconfig index 1decdd89648..3317f3c5603 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -219,7 +219,7 @@ config ENV_IS_IN_MMC Specifies which MMC device the environment is stored in. - CONFIG_SYS_MMC_ENV_PART (optional): + CONFIG_ENV_MMC_EMMC_HW_PARTITION (optional): Specifies which MMC partition the environment is stored in. If not set, defaults to partition 0, the user area. Common values might be @@ -252,7 +252,7 @@ config ENV_IS_IN_MMC This value may also be positive or negative; this is handled in the same way as CONFIG_ENV_OFFSET. - In case CONFIG_SYS_MMC_ENV_PART is 1 (i.e. environment in eMMC boot + In case CONFIG_ENV_MMC_EMMC_HW_PARTITION is 1 (i.e. environment in eMMC boot partition) then setting CONFIG_ENV_OFFSET_REDUND to the same value as CONFIG_ENV_OFFSET makes use of the second eMMC boot partition for the redundant environment copy. @@ -708,8 +708,8 @@ config ENV_MMC_DEVICE_INDEX 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" +config ENV_MMC_EMMC_HW_PARTITION + int "eMMC hardware partition number" depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT default 0 help diff --git a/env/mmc.c b/env/mmc.c index dba99bd4d3d..5d1cb78e5ca 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -157,7 +157,7 @@ static inline s64 mmc_offset(struct mmc *mmc, int copy) int hwpart = 0; int err; -#if defined(CONFIG_SYS_MMC_ENV_PART) +#if defined(CONFIG_ENV_MMC_EMMC_HW_PARTITION) hwpart = mmc_get_env_part(mmc); #endif @@ -216,7 +216,7 @@ static bool mmc_env_is_redundant_in_both_boot_hwparts(struct mmc *mmc) if (!IS_ENABLED(CONFIG_ENV_REDUNDANT)) return false; - if (CONFIG_SYS_MMC_ENV_PART != 1) + if (CONFIG_ENV_MMC_EMMC_HW_PARTITION != 1) return false; return mmc_offset(mmc, 0) == mmc_offset(mmc, 1); @@ -239,10 +239,10 @@ __weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) return 0; } -#ifdef CONFIG_SYS_MMC_ENV_PART +#ifdef CONFIG_ENV_MMC_EMMC_HW_PARTITION __weak uint mmc_get_env_part(struct mmc *mmc) { - return CONFIG_SYS_MMC_ENV_PART; + return CONFIG_ENV_MMC_EMMC_HW_PARTITION; } static unsigned char env_mmc_orig_hwpart; |