diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-10 07:51:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-10 07:51:56 -0400 |
| commit | dd12b2f632fa32d154dfb338419b987a99071862 (patch) | |
| tree | cdbadca07c22b337f35bb515057c73e06a7e6bf1 /env/mmc.c | |
| parent | 2d4cd12dc219066117001067a106efc11cb800c4 (diff) | |
| parent | 1c1f4f0a4b6a0796160e50b67f84b73f435a334b (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-net
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 b24c35cec94..251ad07d7c0 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -353,6 +353,7 @@ static int env_mmc_load(void) int ret; int dev = mmc_get_env_dev(); const char *errmsg; + env_t *ep = NULL; mmc = find_mmc_device(dev); @@ -374,6 +375,10 @@ static int env_mmc_load(void) } ret = env_import(buf, 1); + if (!ret) { + ep = (env_t *)buf; + gd->env_addr = (ulong)&ep->data; + } fini: fini_mmc_for_env(mmc); |