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 ---
env/ext4.c | 3 +-- env/mmc.c | 6 +----- include/env_internal.h | 1 + 3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/env/ext4.c b/env/ext4.c index e666f7b945..caa3e05a57 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -187,6 +187,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 ee376c3e0c..d959ba6d80 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -232,7 +232,6 @@ fini: return ret; }
-#if defined(CONFIG_CMD_ERASEENV) static inline int erase_env(struct mmc *mmc, unsigned long size, unsigned long offset) { @@ -278,7 +277,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, @@ -393,8 +391,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 708c833a55..b7bddcb00d 100644 --- 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;