Merge git://www.denx.de/git/u-boot-imx

[people/ms/u-boot.git] / env / onenand.c

diff --git a/env/onenand.c b/env/onenand.c
index cb1ab53216c319348e272315761ef0f18a97042e..2e3045c5f5de69b9de5acaa60eb58df1c8f435af 100644 (file)
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -21,14 +21,12 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
 
-char *env_name_spec = "OneNAND";
-
 #define ONENAND_MAX_ENV_SIZE   CONFIG_ENV_SIZE
 #define ONENAND_ENV_SIZE(mtd)  (ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE)
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static void env_onenand_load(void)
+static int env_onenand_load(void)
 {
        struct mtd_info *mtd = &onenand_mtd;
 #ifdef CONFIG_ENV_ADDR_FLEX
@@ -61,6 +59,8 @@ static void env_onenand_load(void)
        rc = env_import(buf, 1);
        if (rc)
                gd->env_valid = ENV_VALID;
+
+       return rc ? 0 : -EIO;
 }
 
 static int env_onenand_save(void)
@@ -108,6 +108,7 @@ static int env_onenand_save(void)
 
 U_BOOT_ENV_LOCATION(onenand) = {
        .location       = ENVL_ONENAND,
+       ENV_NAME("OneNAND")
        .load           = env_onenand_load,
        .save           = env_save_ptr(env_onenand_save),
 };