[U-Boot] [PATCH 3/3] serial: Migrate CONFIG_ARM_DCC to Kconfig

[Tuomas Tynkkynen]

Signed-off-by: Tuomas Tynkkynen <tuomas at tuxera.com>
---
 arch/arm/Kconfig                | 2 ++
 drivers/serial/Kconfig          | 5 +++++
 include/configs/xilinx_zynqmp.h | 1 -
 include/configs/zynq-common.h   | 2 --
 scripts/config_whitelist.txt    | 1 -
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 190f883aa8..44a4471b47 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -776,6 +776,7 @@ config ARCH_ZYNQ
 	select CLK
 	select SPL_CLK if SPL
 	select CLK_ZYNQ
+	imply ARM_DCC
 	imply CMD_CLK
 	imply FAT_WRITE
 	imply CMD_SPL
@@ -792,6 +793,7 @@ config ARCH_ZYNQMP
 	select SPL_BOARD_INIT if SPL
 	select SPL_CLK if SPL
 	select DM_USB if USB
+	imply ARM_DCC
 	imply FAT_WRITE
 
 config TEGRA
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 9387b642b3..41ce6dec8c 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -432,6 +432,11 @@ config AR933X_UART
 	  tree binding to operate, please refer to the document at
 	  doc/device-tree-bindings/serial/qca,ar9330-uart.txt.
 
+config ARM_DCC
+	bool "ARM DCC (Debug Communications Channel) serial console support"
+	help
+	  Select this to enable a serial port using the ARM JTAG DCC port.
+
 config ATMEL_USART
 	bool "Atmel USART support"
 	help
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 8c0b5d9c06..312a2a83ff 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -42,7 +42,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 0x2000000)
 
 /* Serial setup */
-#define CONFIG_ARM_DCC
 #define CONFIG_CPU_ARMV8
 
 #define CONFIG_SYS_BAUDRATE_TABLE \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 554fb66634..699c91d3c5 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -32,8 +32,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE  \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-#define CONFIG_ARM_DCC
-
 /* Ethernet driver */
 #if defined(CONFIG_ZYNQ_GEM)
 # define CONFIG_MII
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 30da0122f0..417a978f0a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -59,7 +59,6 @@ CONFIG_ARMV7_SECURE_MAX_SIZE
 CONFIG_ARMV7_SECURE_RESERVE_SIZE
 CONFIG_ARMV8_SWITCH_TO_EL1
 CONFIG_ARM_ARCH_CP15_ERRATA
-CONFIG_ARM_DCC
 CONFIG_ARM_FREQ
 CONFIG_ARM_GIC_BASE_ADDRESS
 CONFIG_ARM_PL180_MMCI_BASE
-- 
2.16.3