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 git://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
env
/
dataflash.c
diff --git
a/env/dataflash.c
b/env/dataflash.c
index afa08f8fd50914b875f53b9cc1138edf7c23e125..77bc595e0debc4c65a4518900237d80022166731 100644
(file)
--- a/
env/dataflash.c
+++ b/
env/dataflash.c
@@
-23,7
+23,7
@@
static int env_dataflash_get_char(int index)
return c;
}
-static
void
env_dataflash_load(void)
+static
int
env_dataflash_load(void)
{
ulong crc, new = 0;
unsigned off;
@@
-44,6
+44,8
@@
static void env_dataflash_load(void)
env_import(buf, 1);
else
set_default_env("!bad CRC");
+
+ return 0;
}
#ifdef CONFIG_ENV_OFFSET_REDUND