diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-14 15:21:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-14 15:21:48 -0400 |
| commit | e6e67bb9e0a40f3eb3c87d16935192821987c3e0 (patch) | |
| tree | 9a2eab87033f4c7db308d39c545caa947e7cf331 /env/mmc.c | |
| parent | 089914ac5efd93de0eaa0881b0c95bcf1d2f3c04 (diff) | |
| parent | 64948e247e83c58adc485b808acc539ea2c5d3c9 (diff) | |
Merge branch '2023-07-14-assorted-general-updates'
- A number of assorted general fixes and code updates
Diffstat (limited to 'env/mmc.c')
| -rw-r--r-- | env/mmc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/env/mmc.c b/env/mmc.c index 7a5836ad66c..cb14bbb58f1 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -114,8 +114,13 @@ static inline s64 mmc_offset(struct mmc *mmc, int copy) if (IS_ENABLED(CONFIG_SYS_MMC_ENV_PART)) hwpart = mmc_get_env_part(mmc); +#if defined(CONFIG_ENV_MMC_PARTITION) + str = CONFIG_ENV_MMC_PARTITION; +#else /* look for the partition in mmc CONFIG_SYS_MMC_ENV_DEV */ str = ofnode_conf_read_str(dt_prop.partition); +#endif + if (str) { /* try to place the environment at end of the partition */ err = mmc_offset_try_partition(str, copy, &val); |