Merge branch '2022-08-04-Kconfig-migrations'

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

diff --git a/env/flash.c b/env/flash.c
index b3230fd..1e75f8c 100644 (file)
--- a/env/flash.c
+++ b/env/flash.c
@@ -13,7 +13,6 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
-#include <flash.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
@@ -26,6 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifndef CONFIG_SPL_BUILD
 # if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
+#  include <flash.h>
 #  define CMD_SAVEENV
 # elif defined(CONFIG_ENV_ADDR_REDUND)
 #  error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
@@ -228,7 +228,7 @@ static int env_flash_init(void)
                return 0;
        }
 
-       gd->env_valid   = ENV_INVALID;
+       gd->env_valid = ENV_INVALID;
        return 0;
 }
 #endif