projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-rockchip-20200130' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
env
/
mmc.c
diff --git
a/env/mmc.c
b/env/mmc.c
index b7b833f4235273116e19db93743664ee0c2f7037..b24c35cec94e24f200516656972fa7dac7eb3337 100644
(file)
--- a/
env/mmc.c
+++ b/
env/mmc.c
@@
-8,7
+8,8
@@
#include <common.h>
#include <command.h>
#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>
#include <fdtdec.h>
#include <linux/stddef.h>
#include <malloc.h>
@@
-21,17
+22,8
@@
#define __STR(X) #X
#define STR(X) __STR(X)
#define __STR(X) #X
#define STR(X) __STR(X)
-#if defined(CONFIG_ENV_SIZE_REDUND) && \
- (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE)
-#error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
-#endif
-
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-#if !defined(CONFIG_ENV_OFFSET)
-#define CONFIG_ENV_OFFSET 0
-#endif
-
#if CONFIG_IS_ENABLED(OF_CONTROL)
static inline int mmc_offset_try_partition(const char *str, s64 *val)
{
#if CONFIG_IS_ENABLED(OF_CONTROL)
static inline int mmc_offset_try_partition(const char *str, s64 *val)
{
@@
-346,7
+338,7
@@
fini:
fini_mmc_for_env(mmc);
err:
if (ret)
fini_mmc_for_env(mmc);
err:
if (ret)
-
set_default_env
(errmsg, 0);
+
env_set_default
(errmsg, 0);
#endif
return ret;
#endif
return ret;
@@
-387,7
+379,7
@@
fini:
fini_mmc_for_env(mmc);
err:
if (ret)
fini_mmc_for_env(mmc);
err:
if (ret)
-
set_default_env
(errmsg, 0);
+
env_set_default
(errmsg, 0);
#endif
return ret;
}
#endif
return ret;
}