env: add ENV_ERASE_PTR macro

Add ENV_ERASE_PTR macro to handle erase opts and remove the associated
ifdef.

This patch is a extension of previous commit 82b2f4135719 ("env_internal.h:
add alternative ENV_SAVE_PTR macro").

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

diff --git a/env/ext4.c b/env/ext4.c
index ec643f2226abfe888a8d6f46ef8ccc7c1d993357..9f65afb8a4235036ae2faafec8f483c78264ef52 100644 (file)
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -188,6 +188,5 @@ U_BOOT_ENV_LOCATION(ext4) = {
        ENV_NAME("EXT4")
        .load           = env_ext4_load,
        .save           = ENV_SAVE_PTR(env_ext4_save),
-       .erase          = CONFIG_IS_ENABLED(CMD_ERASEENV) ? env_ext4_erase :
-                                                           NULL,
+       .erase          = ENV_ERASE_PTR(env_ext4_erase),
 };

diff --git a/env/mmc.c b/env/mmc.c
index 9b226be1d5bf46826bc1917a2c55dc5b3a3703c1..09e94f0bd3b182f991f8e307d9dd62b04b1fbe55 100644 (file)
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -233,7 +233,6 @@ fini:
        return ret;
 }
 
-#if defined(CONFIG_CMD_ERASEENV)
 static inline int erase_env(struct mmc *mmc, unsigned long size,
                            unsigned long offset)
 {
@@ -279,7 +278,6 @@ static int env_mmc_erase(void)
 
        return ret;
 }
-#endif /* CONFIG_CMD_ERASEENV */
 #endif /* CONFIG_CMD_SAVEENV && !CONFIG_SPL_BUILD */
 
 static inline int read_env(struct mmc *mmc, unsigned long size,
@@ -394,8 +392,6 @@ U_BOOT_ENV_LOCATION(mmc) = {
        .load           = env_mmc_load,
 #ifndef CONFIG_SPL_BUILD
        .save           = env_save_ptr(env_mmc_save),
-#if defined(CONFIG_CMD_ERASEENV)
-       .erase          = env_mmc_erase,
-#endif
+       .erase          = ENV_ERASE_PTR(env_mmc_erase)
 #endif
 };

diff --git a/include/env_internal.h b/include/env_internal.h
index 708c833a5504a8f9c8b9225688aac4869eb28605..b7bddcb00d81c25b8b0fa96b55911ad10edb8412 100644 (file)
--- a/include/env_internal.h
+++ b/include/env_internal.h
@@ -211,6 +211,7 @@ struct env_driver {
 #endif
 
 #define ENV_SAVE_PTR(x) (CONFIG_IS_ENABLED(SAVEENV) ? (x) : NULL)
+#define ENV_ERASE_PTR(x) (CONFIG_IS_ENABLED(CMD_ERASEENV) ? (x) : NULL)
 
 extern struct hsearch_data env_htab;