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 6d95d6409bd3c0d2d43810c8688a91fac0218c98..77bc595e0debc4c65a4518900237d80022166731 100644 (file)
--- a/env/dataflash.c
+++ b/env/dataflash.c
@@ -14,11 +14,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
-
-char *env_name_spec = "dataflash";
-
-static unsigned char env_dataflash_get_char(int index)
+static int env_dataflash_get_char(int index)
 {
        uchar c;
 
@@ -27,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;
@@ -48,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
@@ -68,25 +66,10 @@ static int env_dataflash_save(void)
                                CONFIG_ENV_SIZE);
 }
 
-/*
- * Initialize environment use
- *
- * We are still running from ROM, so data use is limited.
- * Use a (moderately small) buffer on the stack
- */
-int env_dataflash_init(void)
-{
-       /* use default */
-       gd->env_addr = (ulong)&default_environment[0];
-       gd->env_valid = ENV_VALID;
-
-       return 0;
-}
-
 U_BOOT_ENV_LOCATION(dataflash) = {
        .location       = ENVL_DATAFLASH,
+       ENV_NAME("dataflash")
        .get_char       = env_dataflash_get_char,
        .load           = env_dataflash_load,
        .save           = env_save_ptr(env_dataflash_save),
-       .init           = env_dataflash_init,
 };