diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
| commit | 5939afc9611e8ba4a86b96e67670b765ee27668e (patch) | |
| tree | 369402e0305a7b8f9f905baec6387bfd9683ba71 /env/mmc.c | |
| parent | d7ae932152ddf58125a05f4eb28596d9b31bdb1e (diff) | |
| parent | ec1fa18561f818bee252da2c331d371ad26037d2 (diff) | |
Merge branch '2019-08-11-master-imports'
- environment cleanup
- HiKey 960 support
- Some PCI fixes
Diffstat (limited to 'env/mmc.c')
| -rw-r--r-- | env/mmc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/env/mmc.c b/env/mmc.c index b7b833f4235..9f1878def13 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -8,7 +8,8 @@ #include <common.h> #include <command.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <fdtdec.h> #include <linux/stddef.h> #include <malloc.h> @@ -346,7 +347,7 @@ fini: fini_mmc_for_env(mmc); err: if (ret) - set_default_env(errmsg, 0); + env_set_default(errmsg, 0); #endif return ret; @@ -387,7 +388,7 @@ fini: fini_mmc_for_env(mmc); err: if (ret) - set_default_env(errmsg, 0); + env_set_default(errmsg, 0); #endif return ret; } |