From d315628edbc99572c3d35cb72fffcd32e12f859b Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Wed, 26 Apr 2017 22:28:02 -0600
Subject: [PATCH] Convert CONFIG_CMD_CLK to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_CLK

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply CMD_CLK on ARCH_ZYNQ]
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                        | 1 -
 arch/arm/Kconfig              | 1 +
 cmd/Kconfig                   | 9 +++++++++
 configs/pic32mzdask_defconfig | 1 +
 include/config_cmd_all.h      | 1 -
 include/configs/pic32mzdask.h | 1 -
 include/configs/zynq-common.h | 1 -
 scripts/config_whitelist.txt  | 1 -
 8 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 2d084b2cbb..0ac01363f7 100644
--- a/README
+++ b/README
@@ -826,7 +826,6 @@ The following options need to be configured:
 		CONFIG_CMD_BOOTD	  bootd
 		CONFIG_CMD_BOOTI	* ARM64 Linux kernel Image support
 		CONFIG_CMD_CACHE	* icache, dcache
-		CONFIG_CMD_CLK   	* clock command support
 		CONFIG_CMD_CONSOLE	  coninfo
 		CONFIG_CMD_CRC32	* crc32
 		CONFIG_CMD_DATE		* support for RTC, date/time...
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0b70c47407..513a35fc4e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -676,6 +676,7 @@ config ARCH_ZYNQ
 	select CLK
 	select SPL_CLK
 	select CLK_ZYNQ
+	imply CMD_CLK
 
 config ARCH_ZYNQMP
 	bool "Support Xilinx ZynqMP Platform"
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 7a124415ed..9eb6a353cb 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -387,6 +387,15 @@ endmenu
 
 menu "Device access commands"
 
+config CMD_CLK
+	bool "clk - Show clock frequencies"
+	help
+	  (deprecated)
+	  Shows clock frequences by calling a sock_clk_dump() hook function.
+	  This is depreated in favour of using the CLK uclass and accessing
+	  clock values from associated drivers. However currently no command
+	  exists for this.
+
 config CMD_DM
 	bool "dm - Access to driver model information"
 	depends on DM
diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig
index e1676643d5..9eb80766ed 100644
--- a/configs/pic32mzdask_defconfig
+++ b/configs/pic32mzdask_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="dask # "
 CONFIG_LOOPW=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_CLK=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 38c9600142..d40e18f65d 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -13,7 +13,6 @@
  * Alphabetical list of all possible commands.
  */
 
-#define CONFIG_CMD_CLK		/* Clock support		*/
 #define CONFIG_CMD_DATE		/* support for RTC, date/time...*/
 #define CONFIG_CMD_DIAG		/* Diagnostics			*/
 #define CONFIG_CMD_DISPLAY	/* Display support		*/
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 9042dc269e..2dcc6c4539 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -53,7 +53,6 @@
  * Commands
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_CMD_CLK
 
 /*------------------------------------------------------------
  * Console Configuration
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1fa5599865..51edd463a1 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -236,7 +236,6 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CLOCKS
-#define CONFIG_CMD_CLK
 #define CONFIG_SYS_MAXARGS		32 /* max number of command args */
 #define CONFIG_SYS_CBSIZE		256 /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index af81d25d91..0f72fc430c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -393,7 +393,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_CLK
 CONFIG_CMD_CRAMFS
 CONFIG_CMD_DATE
 CONFIG_CMD_DEFAULTENV_VARS
-- 
2.39.5