Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/env/env.c b/env/env.c
index 2b8b9611cfff107e45787c0161f105515e307562..76a5608628fc3c1b9c1be12bcffb5b6843a5f3dd 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -28,9 +28,7 @@ static struct env_driver *env_driver_lookup(enum env_location loc)
 
 static enum env_location env_get_default_location(void)
 {
-       if IS_ENABLED(CONFIG_ENV_IS_IN_DATAFLASH)
-               return ENVL_DATAFLASH;
-       else if IS_ENABLED(CONFIG_ENV_IS_IN_EEPROM)
+       if IS_ENABLED(CONFIG_ENV_IS_IN_EEPROM)
                return ENVL_EEPROM;
        else if IS_ENABLED(CONFIG_ENV_IS_IN_FAT)
                return ENVL_FAT;
@@ -74,7 +72,7 @@ int env_get_char(int index)
        struct env_driver *drv = env_driver_lookup_default();
        int ret;
 
-       if (!gd->env_valid)
+       if (gd->env_valid == ENV_INVALID)
                return default_environment[index];
        if (!drv)
                return -ENODEV;
@@ -98,7 +96,7 @@ int env_load(void)
                return -ENODEV;
        if (!drv->load)
                return 0;
-       drv->load();  /* TODO(sjg@chromium.org): Make this return an error */
+       ret = drv->load();
        if (ret) {
                debug("%s: Environment failed to load (err=%d)\n", __func__,
                      ret);
@@ -138,7 +136,7 @@ int env_init(void)
                ret = drv->init();
        if (ret == -ENOENT) {
                gd->env_addr = (ulong)&default_environment[0];
-               gd->env_valid = 0;
+               gd->env_valid = ENV_VALID;
 
                return 0;
        } else if (ret) {