diff --git a/cmd/Kconfig b/cmd/Kconfig
index a5c557e5b2697be92610fcd17a93d087602f7465..bb1980ddb3bd8c9509d24845600907ee44ffbad4 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1416,6 +1416,15 @@ config CMD_KGDB
 	  single-stepping, inspecting variables, etc. This is supported only
 	  on PowerPC at present.
 
+config CMD_TRACE
+	bool "trace - Support tracing of function calls and timing"
+	help
+	  Enables a command to control using of function tracing within
+	  U-Boot. This allows recording of call traces including timing
+	  information. The command can write data to memory for exporting
+	  for analsys (e.g. using bootchart). See doc/README.trace for full
+	  details.
+
 endmenu
 
 config CMD_UBI
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 3b73bbc5255429a87239bd5cd3ec3709130ea8f8..9c9681e8ac9a85d87e33ded6bcda01c543626dc6 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -17,7 +17,6 @@
 
 #ifdef FTRACE
 #define CONFIG_TRACE
-#define CONFIG_CMD_TRACE
 #define CONFIG_TRACE_BUFFER_SIZE	(16 << 20)
 #define CONFIG_TRACE_EARLY_SIZE		(8 << 20)
 #define CONFIG_TRACE_EARLY
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 13777abb4cf25fec8bc6e7047c54b5d07e8fb27c..7567ccd90561c8ff2234c5e32e6dfed20010e6aa 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -8,7 +8,6 @@
 
 #ifdef FTRACE
 #define CONFIG_TRACE
-#define CONFIG_CMD_TRACE
 #define CONFIG_TRACE_BUFFER_SIZE	(16 << 20)
 #define CONFIG_TRACE_EARLY_SIZE		(8 << 20)
 #define CONFIG_TRACE_EARLY
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0621e7b0010b9c2867f8178ccda8191b542e9532..a865bfecf578e763c4fde7af7b13ba7c730fb57d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -293,7 +293,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_TRACE
 CONFIG_CMD_TSI148
 CONFIG_CMD_UNIVERSE
 CONFIG_CMD_UUID