From patchwork Thu Dec 17 12:00:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 558259 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 18C471402A8 for ; Thu, 17 Dec 2015 23:06:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b=snz2diGQ; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2A5E6A7566; Thu, 17 Dec 2015 13:01:57 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 ioHGyeW716LM; Thu, 17 Dec 2015 13:01:56 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A1864A754D; Thu, 17 Dec 2015 13:01:56 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6C565A752C for ; Thu, 17 Dec 2015 13:01:25 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 osJz0IKog-JX for ; Thu, 17 Dec 2015 13:01:25 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=ERR(-1.5) (only DNSBL check requested) Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by theia.denx.de (Postfix) with ESMTPS id 139A6B37D5 for ; Thu, 17 Dec 2015 13:01:17 +0100 (CET) Received: by mail-wm0-f52.google.com with SMTP id l126so18061601wml.0 for ; Thu, 17 Dec 2015 04:01:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=1IRU/BIS76IzIMziRfZf5VWZZa2CYzfO4E1ymRecNX8=; b=snz2diGQ4M1CINmt2yKbcdkq/YKFirnShA31PAnvQxd3our8QxHJGhEZ/814PdCW6h +zMDCBPxhn4FdeMe+6C7gxLk4I2LHKpA3J6ZxFmo98i6aZ9S2ZL5ydSwyqpnQsAwiZNp XAJaXBMeBZ9UDBSwvj4XI4JObeBWnw1WOaf7oa7o0J9SK6Rki+8MQsYkRrp5xVPePH2u v2UFDoZxbOzn8qnmbSa3yQLryDeQBbIcv+4ClGGGEU2btpi0/jNN5RIp6ZqAwj0yzr4J fC/WBah+QluTYcxBhKgw6zTLdfkq1yGqeP8tltjYRaC4F6iKnFA7kHdbRsSHTIkO4/9J x3Xg== 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:in-reply-to:references; bh=1IRU/BIS76IzIMziRfZf5VWZZa2CYzfO4E1ymRecNX8=; b=D0c4dS3l5XExTaIZaVx6IiHl3QUQnbD8VlxVfj6Nf0klS8gNWF7z6Y7lBnu7BvkSB8 kxTTgokG3Y2qqHYY/DYg3BORHEcFwTfh5WYSOqX+Ea4zYbQZfaynRdpZxymoRhcB+tSK ryUGbYSIU2UNVkiFhKkg32G/ahZZwvXVuWcOVj/szftbh8nYpmPAnD+hHzc20Q3ugeT6 c8hGvw8+bIJWQI0xWC6iohKhY9t235Q8exbNPYD7OarUWrp1ECRcwdxuPZG9+jVTRaPS pBVTKyUSME2Z3KHbPVRW49xO56zQN9JqeRlMqL8hs51Dj2n3oFRloz7jKuLcFLT2+jqf IpDQ== X-Gm-Message-State: ALoCoQlPtKAgpVpGxYZ6viRG5uFFiETd6cl+YFEgPQt4L7Y/lLGF4umg7Azm86f1kmWIGQZ7KLpZQtsj6lT8gKoVdLEAz+pzbw== X-Received: by 10.194.63.238 with SMTP id j14mr63719942wjs.172.1450353662009; Thu, 17 Dec 2015 04:01:02 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id t64sm2015031wmf.23.2015.12.17.04.01.00 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 17 Dec 2015 04:01:00 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Thu, 17 Dec 2015 13:00:54 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [U-Boot] [PATCH v2 3/3] serial: uartlite: Add uartlite to Kconfig 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" - Move config option out of board file. - Remove uartlite address from config file Signed-off-by: Michal Simek Reviewed-by: Thomas Chou --- Changes in v2: None board/xilinx/microblaze-generic/xparameters.h | 4 ---- configs/microblaze-generic_defconfig | 1 + drivers/serial/Kconfig | 7 +++++++ include/configs/microblaze-generic.h | 7 +------ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/board/xilinx/microblaze-generic/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h index 8ba146cb88db..11b3c9a4846e 100644 --- a/board/xilinx/microblaze-generic/xparameters.h +++ b/board/xilinx/microblaze-generic/xparameters.h @@ -28,10 +28,6 @@ #define XILINX_TIMER_BASEADDR 0x41c00000 #define XILINX_TIMER_IRQ 0 -/* Uart pheriphery is RS232_Uart */ -#define XILINX_UARTLITE_BASEADDR 0x40600000 -#define XILINX_UARTLITE_BAUDRATE 115200 - /* IIC pheriphery is IIC_EEPROM */ #define XILINX_IIC_0_BASEADDR 0x40800000 #define XILINX_IIC_0_FREQ 100000 diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 5df080b6a87c..9a7bb915466f 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -9,3 +9,4 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_XILINX_UARTLITE=y diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index f1e221799b81..ddf49ba9cef3 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -230,4 +230,11 @@ config UNIPHIER_SERIAL If you have a UniPhier based board and want to use the on-chip serial ports, say Y to this option. If unsure, say N. +config XILINX_UARTLITE + bool "Xilinx Uarlite support" + depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP) + help + If you have a Xilinx based board and want to use the uartlite + serial ports, say Y to this option. If unsure, say N. + endmenu diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 10ac8328b8ff..6e3c80b14350 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -37,10 +37,7 @@ # define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} -#ifdef XILINX_UARTLITE_BASEADDR -# define CONFIG_XILINX_UARTLITE -# define CONFIG_SERIAL_BASE XILINX_UARTLITE_BASEADDR -#elif XILINX_UART16550_BASEADDR +#if XILINX_UART16550_BASEADDR # define CONFIG_SYS_NS16550_SERIAL # if defined(__MICROBLAZEEL__) # define CONFIG_SYS_NS16550_REG_SIZE -4 @@ -51,8 +48,6 @@ # define CONFIG_SYS_NS16550_COM1 \ ((XILINX_UART16550_BASEADDR & ~0xF) + 0x1000) # define CONFIG_SYS_NS16550_CLK XILINX_UART16550_CLOCK_HZ -#else -# error Undefined uart #endif /* setting reset address */