env: Rename getenv_hex(), getenv_yesno(), getenv_ulong()

[platform/kernel/u-boot.git] / env / eeprom.c

diff --git a/env/eeprom.c b/env/eeprom.c
index 78569b2..39adcca 100644 (file)
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -21,10 +21,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
-
-char *env_name_spec = "EEPROM";
-
 static int eeprom_bus_read(unsigned dev_addr, unsigned offset,
                           uchar *buffer, unsigned cnt)
 {
@@ -65,7 +61,7 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset,
        return rcode;
 }
 
-uchar env_get_char_spec(int index)
+static uchar env_eeprom_get_char(int index)
 {
        uchar c;
        unsigned int off = CONFIG_ENV_OFFSET;
@@ -80,7 +76,7 @@ uchar env_get_char_spec(int index)
        return c;
 }
 
-void env_relocate_spec(void)
+static void env_eeprom_load(void)
 {
        char buf_env[CONFIG_ENV_SIZE];
        unsigned int off = CONFIG_ENV_OFFSET;
@@ -188,7 +184,7 @@ void env_relocate_spec(void)
        env_import(buf_env, 1);
 }
 
-int saveenv(void)
+static int env_eeprom_save(void)
 {
        env_t   env_new;
        int     rc;
@@ -198,8 +194,6 @@ int saveenv(void)
        char flag_obsolete      = OBSOLETE_FLAG;
 #endif
 
-       BUG_ON(env_ptr != NULL);
-
        rc = env_export(&env_new);
        if (rc)
                return rc;
@@ -231,23 +225,10 @@ int saveenv(void)
        return rc;
 }
 
-/*
- * Initialize Environment use
- *
- * We are still running from ROM, so data use is limited.
- * Use a (moderately small) buffer on the stack
- */
-int env_init(void)
-{
-       gd->env_addr = (ulong)&default_environment[0];
-       gd->env_valid = ENV_VALID;
-       return 0;
-}
-
 U_BOOT_ENV_LOCATION(eeprom) = {
        .location       = ENVL_EEPROM,
-       .get_char       = env_get_char_spec,
-       .load           = env_relocate_spec,
-       .save           = env_save_ptr(saveenv),
-       .init           = env_init,
+       ENV_NAME("EEPROM")
+       .get_char       = env_eeprom_get_char,
+       .load           = env_eeprom_load,
+       .save           = env_save_ptr(env_eeprom_save),
 };