projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: rmobile: blanche: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI
[oweals/u-boot.git]
/
env
/
mmc.c
diff --git
a/env/mmc.c
b/env/mmc.c
index b24c35cec94e24f200516656972fa7dac7eb3337..a8b661db80af45766811d7620c1b5b5d6dca23e7 100644
(file)
--- a/
env/mmc.c
+++ b/
env/mmc.c
@@
-27,7
+27,7
@@
DECLARE_GLOBAL_DATA_PTR;
#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)
{
-
disk_partition_t
info;
+
struct disk_partition
info;
struct blk_desc *desc;
int len, i, ret;
struct blk_desc *desc;
int len, i, ret;
@@
-353,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);
@@
-374,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);