summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-09-16 16:33:04 +0900
committerTom Rini <trini@ti.com>2014-09-24 18:30:29 -0400
commit1d5c20154f0797e9a79fd0b39a9ae8a8801f6a51 (patch)
treeaeed6d3cb0b6af4b16f12959e15361a8109bc1b5
parent726ac8e4c505f086c1decd5263068373254ee60a (diff)
downloadu-boot-imx-1d5c20154f0797e9a79fd0b39a9ae8a8801f6a51.zip
u-boot-imx-1d5c20154f0797e9a79fd0b39a9ae8a8801f6a51.tar.gz
u-boot-imx-1d5c20154f0797e9a79fd0b39a9ae8a8801f6a51.tar.bz2
kconfig: move CONFIG_CMD_IMPORTENV to Kconfig
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@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/Kconfig6
-rw-r--r--configs/bf506f-ezkit_defconfig1
-rw-r--r--include/config_cmd_defaults.h1
-rw-r--r--include/configs/bf506f-ezkit.h1
-rw-r--r--include/configs/h2200.h1
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