[U-Boot] [PATCH 1/4] env: fat: drop not needed #ifdef CMD_SAVEENV

env_save_ptr(..) macro handles CMD_SAVEENV already.
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com --- env/fat.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/env/fat.c b/env/fat.c index 7f74c64dfe..165a11345f 100644 --- a/env/fat.c +++ b/env/fat.c @@ -134,7 +134,5 @@ U_BOOT_ENV_LOCATION(fat) = { #ifdef LOADENV .load = env_fat_load, #endif -#ifdef CMD_SAVEENV .save = env_save_ptr(env_fat_save), -#endif };

env_save_ptr(..) macro handles CMD_SAVEENV already.
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com --- env/flash.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/env/flash.c b/env/flash.c index 32236c716e..f6e62df23c 100644 --- a/env/flash.c +++ b/env/flash.c @@ -360,9 +360,7 @@ U_BOOT_ENV_LOCATION(flash) = { #ifdef LOADENV .load = env_flash_load, #endif -#ifdef CMD_SAVEENV .save = env_save_ptr(env_flash_save), -#endif #ifdef INITENV .init = env_flash_init, #endif

On 14 August 2018 at 03:21, Christian Gmeiner christian.gmeiner@gmail.com wrote:
env_save_ptr(..) macro handles CMD_SAVEENV already.
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com
env/flash.c | 2 -- 1 file changed, 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
I'd be tempted to do these changes in one patch, but either is fine with me.
- Simon

env_save_ptr(..) macro handles CMD_SAVEENV already.
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com --- env/nand.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/env/nand.c b/env/nand.c index 3698e68957..d8d5f2e6b3 100644 --- a/env/nand.c +++ b/env/nand.c @@ -388,8 +388,6 @@ U_BOOT_ENV_LOCATION(nand) = { .location = ENVL_NAND, ENV_NAME("NAND") .load = env_nand_load, -#if defined(CMD_SAVEENV) .save = env_save_ptr(env_nand_save), -#endif .init = env_nand_init, };

On 14 August 2018 at 03:21, Christian Gmeiner christian.gmeiner@gmail.com wrote:
env_save_ptr(..) macro handles CMD_SAVEENV already.
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com
env/nand.c | 2 -- 1 file changed, 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org

env_save_ptr(..) macro handles CMD_SAVEENV already.
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com --- env/sf.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/env/sf.c b/env/sf.c index 494510533a..70c1b61930 100644 --- a/env/sf.c +++ b/env/sf.c @@ -318,9 +318,7 @@ U_BOOT_ENV_LOCATION(sf) = { .location = ENVL_SPI_FLASH, ENV_NAME("SPI Flash") .load = env_sf_load, -#ifdef CMD_SAVEENV .save = env_save_ptr(env_sf_save), -#endif #if defined(INITENV) && defined(CONFIG_ENV_ADDR) .init = env_sf_init, #endif

On 14 August 2018 at 03:21, Christian Gmeiner christian.gmeiner@gmail.com wrote:
env_save_ptr(..) macro handles CMD_SAVEENV already.
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com
env/sf.c | 2 -- 1 file changed, 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org

On 14 August 2018 at 03:21, Christian Gmeiner christian.gmeiner@gmail.com wrote:
env_save_ptr(..) macro handles CMD_SAVEENV already.
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com
env/fat.c | 2 -- 1 file changed, 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org

On Tue, Aug 14, 2018 at 11:21:16AM +0200, Christian Gmeiner wrote:
env_save_ptr(..) macro handles CMD_SAVEENV already.
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com Reviewed-by: Simon Glass sjg@chromium.org
env/fat.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/env/fat.c b/env/fat.c index 7f74c64dfe..165a11345f 100644 --- a/env/fat.c +++ b/env/fat.c @@ -134,7 +134,5 @@ U_BOOT_ENV_LOCATION(fat) = { #ifdef LOADENV .load = env_fat_load, #endif -#ifdef CMD_SAVEENV .save = env_save_ptr(env_fat_save), -#endif
This series breaks a number of platforms (P1022DS_36BIT_NAND, am43xx_hs_evm, mccmon6_nor to name just 3 out of many). Please put v2 of this series through a world build (travis-ci is probably easiest). Thanks!
participants (3)
-
Christian Gmeiner
-
Simon Glass
-
Tom Rini