michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

env: Rename ENV_MMC_PARTITION to ENV_MMC_SW_PARTITION

Browse Source 
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_SW_PARTITION to clarify this is the SD/MMC software
partition table entry selector. Update the help text accordingly.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut
2025-06-09 21:26:41 +02:00
committed by Tom Rini
parent 31617b880a
commit ffc4914703
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/device-tree-bindings/config.txt
View File

@@ -76,7 +76,7 @@ u-boot,mmc-env-partition (int)
precedence. In that case, only if the partition is not found, precedence. In that case, only if the partition is not found,
mmc-env-offset* will be tried. mmc-env-offset* will be tried.
Note that CONFIG_ENV_MMC_PARTITION overrides this device-tree setting. Note that CONFIG_ENV_MMC_SW_PARTITION overrides this device-tree setting.
u-boot,no-apm-finalize (bool) u-boot,no-apm-finalize (bool)
For x86 devices running on coreboot, this tells U-Boot not to lock For x86 devices running on coreboot, this tells U-Boot not to lock

19
env/Kconfig vendored
View File

@@ -719,17 +719,20 @@ config ENV_MMC_EMMC_HW_PARTITION
partition 0 or the first boot partition, which is 1 or some other defined partition 0 or the first boot partition, which is 1 or some other defined
partition. partition.
config USE_ENV_MMC_PARTITION config ENV_MMC_USE_SW_PARTITION
bool "use the mmc environment partition name" bool "Use SD/MMC environment software partition name"
depends on ENV_IS_IN_MMC depends on ENV_IS_IN_MMC
config ENV_MMC_PARTITION config ENV_MMC_SW_PARTITION
string "mmc environment partition name" bool "SD/MMC environment software partition name"
depends on USE_ENV_MMC_PARTITION depends on ENV_MMC_USE_SW_PARTITION
help help
MMC partition name used to save environment variables. SD/MMC software partition name used to save environment variables.
If this variable is unset, u-boot will try to get the env partition name This is a software partition name, i.e. one in partition table, not
from the device-tree's /config node. an eMMC HW partition (see ENV_MMC_EMMC_HW_PARTITION for eMMC HW
partition configuration). If this variable is unset, u-boot will
try to get the env partition name from the device-tree's /config
node.
config ENV_MMC_USE_DT config ENV_MMC_USE_DT
bool "Read partition name and offset in DT" bool "Read partition name and offset in DT"

4
env/mmc.c vendored
View File

@@ -161,8 +161,8 @@ static inline s64 mmc_offset(struct mmc *mmc, int copy)
hwpart = mmc_get_env_part(mmc); hwpart = mmc_get_env_part(mmc);
#endif #endif
#if defined(CONFIG_ENV_MMC_PARTITION) #if defined(CONFIG_ENV_MMC_SW_PARTITION)
str = CONFIG_ENV_MMC_PARTITION; str = CONFIG_ENV_MMC_SW_PARTITION;
#else #else
/* look for the partition in mmc CONFIG_ENV_MMC_DEVICE_INDEX */ /* look for the partition in mmc CONFIG_ENV_MMC_DEVICE_INDEX */
str = ofnode_conf_read_str(dt_prop.partition); str = ofnode_conf_read_str(dt_prop.partition);