Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[u-boot] / env / dataflash.c

diff --git a/env/dataflash.c b/env/dataflash.c
index 9421a6a5b236c598e900cfb66a542e11bf988a88..77bc595e0debc4c65a4518900237d80022166731 100644 (file)
--- a/env/dataflash.c
+++ b/env/dataflash.c
@@ -14,9 +14,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
-
-static unsigned char env_dataflash_get_char(int index)
+static int env_dataflash_get_char(int index)
 {
        uchar c;
 
@@ -25,7 +23,7 @@ static unsigned char 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;
@@ -46,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