Save environment data to mmc.

[u-boot] / common / env_flash.c

diff --git a/common/env_flash.c b/common/env_flash.c
index 75ee8ddc89ee6d761d2c6b25b8f02430529446cc..925c5a02dfb32b1fd6c8b8a1c9b12761ac99b172 100644 (file)
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -34,22 +34,16 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
+#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
 #define CMD_SAVEENV
 #elif defined(CONFIG_ENV_ADDR_REDUND)
-#error Cannot use CONFIG_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH
+#error Cannot use CONFIG_ENV_ADDR_REDUND without CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
 #endif
 
 #if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE)
 #error CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE
 #endif
 
-#ifdef CONFIG_INFERNO
-# ifdef CONFIG_ENV_ADDR_REDUND
-#error CONFIG_ENV_ADDR_REDUND is not implemented for CONFIG_INFERNO
-# endif
-#endif
-
 char * env_name_spec = "Flash";
 
 #ifdef ENV_IS_EMBEDDED
@@ -77,13 +71,9 @@ static env_t *flash_addr_new = (env_t *)CONFIG_ENV_ADDR_REDUND;
 /* CONFIG_ENV_ADDR is supposed to be on sector boundary */
 static ulong end_addr = CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1;
 static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
-
-#define ACTIVE_FLAG   1
-#define OBSOLETE_FLAG 0
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
 extern uchar default_environment[];
-extern int default_environment_size;
 
 
 uchar env_get_char_spec (int index)
@@ -295,13 +285,7 @@ int saveenv(void)
        len      = CONFIG_ENV_SIZE;
 #endif /* CONFIG_ENV_SECT_SIZE */
 
-#ifndef CONFIG_INFERNO
        end_addr = flash_sect_addr + len - 1;
-#else
-       /* this is the last sector, and the size is hardcoded here */
-       /* otherwise we will get stack problems on loading 128 KB environment */
-       end_addr = flash_sect_addr + 0x20000 - 1;
-#endif
 
        debug ("Protect off %08lX ... %08lX\n",
                (ulong)flash_sect_addr, end_addr);