From a55d29d2ac658b33989a7c4c368beff46a98bcde Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Wed, 17 May 2017 03:25:13 -0600
Subject: [PATCH] Convert CONFIG_CMD_ENV_CALLBACK to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_ENV_CALLBACK

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 README                          | 1 -
 cmd/Kconfig                     | 8 ++++++++
 configs/sandbox_defconfig       | 1 +
 configs/sandbox_noblk_defconfig | 1 +
 configs/sandbox_spl_defconfig   | 1 +
 include/configs/sandbox.h       | 1 -
 scripts/config_whitelist.txt    | 1 -
 7 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/README b/README
index a6af0a209c..a785dbfbca 100644
--- a/README
+++ b/README
@@ -833,7 +833,6 @@ The following options need to be configured:
 		CONFIG_CMD_ECHO		  echo arguments
 		CONFIG_CMD_EDITENV	  edit env variable
 		CONFIG_CMD_ELF		* bootelf, bootvx
-		CONFIG_CMD_ENV_CALLBACK	* display details about env callbacks
 		CONFIG_CMD_ENV_FLAGS	* display details about env flags
 		CONFIG_CMD_ENV_EXISTS	* check existence of env variable
 		CONFIG_CMD_EXPORTENV	* export the environment
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 6b9feff94c..3ac876403c 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -314,6 +314,14 @@ config CMD_ENV_EXISTS
 	  Check if a variable is defined in the environment for use in
 	  shell scripting.
 
+config CMD_ENV_CALLBACK
+	bool "env callbacks - print callbacks and their associated variables"
+	help
+	  Some environment variable have callbacks defined by
+	  U_BOOT_ENV_CALLBACK. These are called when the variable changes.
+	  For example changing "baudrate" adjust the serial baud rate. This
+	  command lists the currently defined callbacks.
+
 endmenu
 
 menu "Memory commands"
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 5417057664..410277a287 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
+CONFIG_CMD_ENV_CALLBACK=y
 CONFIG_CMD_MD5SUM=y
 CONFIG_LOOPW=y
 CONFIG_CMD_MEMTEST=y
diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 6c6e6596b3..090e057515 100644
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
+CONFIG_CMD_ENV_CALLBACK=y
 CONFIG_CMD_MD5SUM=y
 CONFIG_LOOPW=y
 CONFIG_CMD_MEMTEST=y
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index cdeb30cb8d..b623e297fb 100644
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
+CONFIG_CMD_ENV_CALLBACK=y
 CONFIG_CMD_MD5SUM=y
 CONFIG_LOOPW=y
 CONFIG_CMD_MEMTEST=y
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 8ba37fc245..9aa18d465f 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -108,7 +108,6 @@
 #define CONFIG_CMD_SANDBOX
 
 #define CONFIG_CMD_ENV_FLAGS
-#define CONFIG_CMD_ENV_CALLBACK
 
 #define CONFIG_BOOTARGS ""
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ec9ee88b17..0cece7d704 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -383,7 +383,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_ENV_CALLBACK
 CONFIG_CMD_ENV_FLAGS
 CONFIG_CMD_ERRATA
 CONFIG_CMD_ESBC_VALIDATE
-- 
2.39.5