[U-Boot] [PATCH v2 07/10] kconfig: move CONFIG_CMD_IMPORTENV to Kconfig

[Masahiro Yamada]

Since CONFIG_CMD_IMPORTENV is defined in config_cmd_defaults.h,
it should be enabled for all the boards except bf506f-ezkit
that undefs it explicitely.

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
Acked-by: Simon Glass <sjg at chromium.org>
Tested-by: Simon Glass <sjg at chromium.org>
---

Changes in v2:
  - Add a help doc

 common/Kconfig                 | 6 ++++++
 configs/bf506f-ezkit_defconfig | 1 +
 include/config_cmd_defaults.h  | 1 -
 include/configs/bf506f-ezkit.h | 1 -
 include/configs/h2200.h        | 1 -
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/Kconfig b/common/Kconfig
index 7875e5e..216a8de 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -19,6 +19,12 @@ config CMD_EXPORTENV
 	help
 	  Export environments.
 
+config CMD_IMPORTENV
+	bool "Enable env import command"
+	default y
+	help
+	  Import environments.
+
 config CMD_GO
 	bool "Enable go command"
 	default y
diff --git a/configs/bf506f-ezkit_defconfig b/configs/bf506f-ezkit_defconfig
index 09c9899..f164e06 100644
--- a/configs/bf506f-ezkit_defconfig
+++ b/configs/bf506f-ezkit_defconfig
@@ -2,3 +2,4 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF506F_EZKIT=y
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_EXPORTENV is not set
+# CONFIG_CMD_IMPORTENV is not set
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index 0ef63ee..d1b3af5 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -9,6 +9,5 @@
 #ifndef _CONFIG_CMD_DEFAULTS_H_
 #define _CONFIG_CMD_DEFAULTS_H_
 
-#define CONFIG_CMD_IMPORTENV 1
 
 #endif
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index f9936a7..0b66cdb 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -85,7 +85,6 @@
  */
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE 0x400
-#undef CONFIG_CMD_IMPORTENV
 
 
 /*
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 9470ad6..109cee9 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -116,7 +116,6 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 38400, 115200 }
 
-#define CONFIG_CMD_IMPORTENV		1
 #define CONFIG_CMD_LOADB
 #define CONFIG_CMD_SOURCE
 #define CONFIG_CMD_RUN
-- 
1.9.1