From patchwork Sun Oct 18 01:41:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 531917 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 579741402D5 for ; Sun, 18 Oct 2015 12:43:45 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=SkGzs3sw; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C38104B77E; Sun, 18 Oct 2015 03:43:00 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wtk68PLkmdHO; Sun, 18 Oct 2015 03:43:00 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F296F4B788; Sun, 18 Oct 2015 03:42:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 25CF84B6A8 for ; Sun, 18 Oct 2015 03:41:50 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R2q5UxATdal0 for ; Sun, 18 Oct 2015 03:41:50 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ig0-f177.google.com (mail-ig0-f177.google.com [209.85.213.177]) by theia.denx.de (Postfix) with ESMTPS id 0C88B4B6CD for ; Sun, 18 Oct 2015 03:41:38 +0200 (CEST) Received: by igbni9 with SMTP id ni9so35417573igb.1 for ; Sat, 17 Oct 2015 18:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=4nuuTgf4K7r6ZKhm3FpmxPFzsycFORetCw46Awn6vjg=; b=SkGzs3swrHh7U0YERYIPM+HMtG8sAZZ1Q1XWZGM2bGToXu76BBsRSF1q4qDOHH9Ndg oXX2KWI4XY/5vf+mmy6aMN9M6T/tZVqiJkZg6JnyDZHhiTHZo/YayaoyeoLfxtn0G7l6 kihNGV5kyrkx1j5c5LC8a97NMNquFCIoNNEkoxqtagy0DQU/PE4TwdAL7nNS0gtaxWZe 6WU4uoaQP6wvRwrYJ9WLLn8jLUGfrDLX4Dkvg+AuZhWSWNV6K+bUZELOlrCRoXTN7skV lGmu4nvzsanocOQsdd90xz34krUL5qdTnxv19pwOMNBIMnlnd7zAahI/XPUaBGv2KMhP q+Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=4nuuTgf4K7r6ZKhm3FpmxPFzsycFORetCw46Awn6vjg=; b=Lpmhmtu6qX72HM+ARa4Vfef7oR1MN7Gw+cQYnhuNua5YwSBe4ZtEuqtNBUvIRWZ/na gbCAXe9C7u6olRRNxwCyWJm98tmXO83HdeYjqMLLZArWLpRiyvDoYA1+DGF7ApQnK00p s+JRKHmp7CoueK7O0aGSXVo0F1iXUHTSNxVI6NUpMfCTkAv+pFcmEMe9yk6T6OcomKIN iH13AoUPKQ2VLPCrC7HbdwvAkQyXxe8U/o2SHaiTAmhYudgIoayHLANftZmHcZwGoBp1 JYga5LRxoIpgU7uVi2/vP2ddbgBPjul+PgCun5JGx0CiMxT8862WQsezNx3gn8ayClLz tTCw== X-Gm-Message-State: ALoCoQmQblDVfTUHPdxscxEGaaD6sPxW362n1nw++/vR4xEvG/IiRGSkMndy6XmQuzidor9F8hFq X-Received: by 10.50.4.65 with SMTP id i1mr13842614igi.0.1445132497376; Sat, 17 Oct 2015 18:41:37 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id i15sm11452393ioe.6.2015.10.17.18.41.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Oct 2015 18:41:36 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id EC17A220BDA; Sat, 17 Oct 2015 19:41:32 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 17 Oct 2015 19:41:26 -0600 Message-Id: <1445132487-13172-14-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1445132487-13172-1-git-send-email-sjg@chromium.org> References: <1445132487-13172-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v2 13/14] arm: zynq: serial: Drop non-device-tree serial driver portions X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Since we use device tree in SPL also, we can drop this code. Signed-off-by: Simon Glass --- Changes in v2: None drivers/serial/serial_zynq.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index c4304dd..c39c1a9 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -195,7 +195,6 @@ DECLARE_PSSERIAL_FUNCTIONS(1); static struct serial_device uart_zynq_serial1_device = INIT_PSSERIAL_STRUCTURE(1, "ttyPS1"); -#if CONFIG_IS_ENABLED(OF_CONTROL) __weak struct serial_device *default_serial_console(void) { const void *blob = gd->fdt_blob; @@ -218,20 +217,6 @@ __weak struct serial_device *default_serial_console(void) return NULL; } -#else -__weak struct serial_device *default_serial_console(void) -{ -#if defined(CONFIG_ZYNQ_SERIAL_UART0) - if (uart_zynq_ports[0]) - return &uart_zynq_serial0_device; -#endif -#if defined(CONFIG_ZYNQ_SERIAL_UART1) - if (uart_zynq_ports[1]) - return &uart_zynq_serial1_device; -#endif - return NULL; -} -#endif void zynq_serial_initialize(void) {