diff options
| author | Tom Rini <trini@konsulko.com> | 2023-02-23 17:30:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-23 17:30:49 -0500 |
| commit | 0b58258a33280a536c5b1e5e90dfdf0b5b5852cc (patch) | |
| tree | 418dbaf5a7f88305974186a1297ff2e9ae4c5aaa /env/mmc.c | |
| parent | 8c39999acb726ef083d3d5de12f20318ee0e5070 (diff) | |
| parent | 5b4acb0ff79df642ef6b1e35fd4b193a4dc3c62b (diff) | |
Merge branch '2023-02-23-assorted-fixes'
- btrfs bugfix, silence a bunch of gcc-12.2 linker warnings finally,
relax one of the trace test time requirements (so CI doesn't fail due
to test being slightly slow, but still correct), and correct env on
MMC and checking for where GPT can be
Diffstat (limited to 'env/mmc.c')
| -rw-r--r-- | env/mmc.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/env/mmc.c b/env/mmc.c index 5b01f657a7a..7a5836ad66c 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -94,7 +94,7 @@ static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val) return 0; } -static inline s64 mmc_offset(int copy) +static inline s64 mmc_offset(struct mmc *mmc, int copy) { const struct { const char *offset_redund; @@ -108,8 +108,12 @@ static inline s64 mmc_offset(int copy) s64 val = 0, defvalue; const char *propname; const char *str; + int hwpart = 0; int err; + if (IS_ENABLED(CONFIG_SYS_MMC_ENV_PART)) + hwpart = mmc_get_env_part(mmc); + /* look for the partition in mmc CONFIG_SYS_MMC_ENV_DEV */ str = ofnode_conf_read_str(dt_prop.partition); if (str) { @@ -121,7 +125,7 @@ static inline s64 mmc_offset(int copy) } /* try the GPT partition with "U-Boot ENV" TYPE GUID */ - if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID)) { + if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID) && hwpart == 0) { err = mmc_offset_try_partition(NULL, copy, &val); if (!err) return val; @@ -138,7 +142,7 @@ static inline s64 mmc_offset(int copy) return ofnode_conf_read_int(propname, defvalue); } #else -static inline s64 mmc_offset(int copy) +static inline s64 mmc_offset(struct mmc *mmc, int copy) { s64 offset = ENV_MMC_OFFSET; @@ -151,7 +155,7 @@ static inline s64 mmc_offset(int copy) __weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) { - s64 offset = mmc_offset(copy); + s64 offset = mmc_offset(mmc, copy); if (offset == ENV_MMC_INVALID_OFFSET) { printf("Invalid ENV offset in MMC, copy=%d\n", copy); |