From patchwork Sat Apr 7 21:27:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 895970 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tuxera.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40JV8F2TfSz9s27 for ; Sun, 8 Apr 2018 07:29:49 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 059E3C21ECA; Sat, 7 Apr 2018 21:28:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 62517C21E70; Sat, 7 Apr 2018 21:28:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2E550C21C2F; Sat, 7 Apr 2018 21:28:04 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id C700BC21C6A for ; Sat, 7 Apr 2018 21:28:03 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Sun, 8 Apr 2018 00:27:09 +0300 Message-ID: <20180407212709.2928-3-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180407212709.2928-1-tuomas@tuxera.com> References: <20180407212709.2928-1-tuomas@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Subject: [U-Boot] [PATCH 3/3] serial: Migrate CONFIG_ARM_DCC to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Tuomas Tynkkynen --- 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