projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
phy: atheros: move delay config to common function
[oweals/u-boot.git]
/
env
/
mmc.c
diff --git
a/env/mmc.c
b/env/mmc.c
index 9f1878def13a63d29cf9ba7e11dfd6f1686fe5ff..251ad07d7c08f2a309667e986c5a662008c3666f 100644
(file)
--- a/
env/mmc.c
+++ b/
env/mmc.c
@@
-22,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)
{
@@
-362,6
+353,7
@@
static int env_mmc_load(void)
int ret;
int dev = mmc_get_env_dev();
const char *errmsg;
int ret;
int dev = mmc_get_env_dev();
const char *errmsg;
+ env_t *ep = NULL;
mmc = find_mmc_device(dev);
mmc = find_mmc_device(dev);
@@
-383,6
+375,10
@@
static int env_mmc_load(void)
}
ret = env_import(buf, 1);
}
ret = env_import(buf, 1);
+ if (!ret) {
+ ep = (env_t *)buf;
+ gd->env_addr = (ulong)&ep->data;
+ }
fini:
fini_mmc_for_env(mmc);
fini:
fini_mmc_for_env(mmc);