kconfig: move CONFIG_CMD_IMPORTENV to Kconfig

masahir0y · trini · commit 1d5c20154f07 · 2014-09-24T18:30:29.000-04:00
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 &lt;yamada.m@jp.panasonic.com&gt;
Acked-by: Simon Glass &lt;sjg@chromium.org&gt;
Tested-by: Simon Glass &lt;sjg@chromium.org&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
