env: Drop env_init_new()

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

diff --git a/env/mmc.c b/env/mmc.c
index d63feea2b823cb8f5215b4d4907d6e3d5ff0022a..88ffc91f0b58838106e560e7648e47fbc5f5880c 100644 (file)
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -23,14 +23,6 @@
 #error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
 #endif
 
-char *env_name_spec = "MMC";
-
-#ifdef ENV_IS_EMBEDDED
-env_t *env_ptr = &environment;
-#else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr;
-#endif /* ENV_IS_EMBEDDED */
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #if !defined(CONFIG_ENV_OFFSET)
@@ -82,15 +74,6 @@ __weak int mmc_get_env_dev(void)
        return CONFIG_SYS_MMC_ENV_DEV;
 }
 
-static int env_mmc_init(void)
-{
-       /* use default */
-       gd->env_addr    = (ulong)&default_environment[0];
-       gd->env_valid   = ENV_VALID;
-
-       return 0;
-}
-
 #ifdef CONFIG_SYS_MMC_ENV_PART
 __weak uint mmc_get_env_part(struct mmc *mmc)
 {
@@ -327,9 +310,9 @@ err:
 
 U_BOOT_ENV_LOCATION(mmc) = {
        .location       = ENVL_MMC,
+       ENV_NAME("MMC")
        .load           = env_mmc_load,
 #ifndef CONFIG_SPL_BUILD
        .save           = env_save_ptr(env_mmc_save),
 #endif
-       .init           = env_mmc_init,
 };