From patchwork Wed Nov 15 02:48:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andes X-Patchwork-Id: 838091 X-Patchwork-Delegate: uboot@andestech.com 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yc8f36w7Vz9sMN for ; Wed, 15 Nov 2017 14:15:55 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B5E2FC21DC1; Wed, 15 Nov 2017 03:14:29 +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 62677C21D75; Wed, 15 Nov 2017 03:14:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2DA67C21D99; Wed, 15 Nov 2017 03:13:39 +0000 (UTC) Received: from ATCSQR.andestech.com (exmail.andestech.com [59.124.169.137]) by lists.denx.de (Postfix) with ESMTPS id D5295C21DA2 for ; Wed, 15 Nov 2017 03:13:37 +0000 (UTC) Received: from mail.andestech.com (atcpcs16.andestech.com [10.0.1.222]) by ATCSQR.andestech.com with ESMTP id vAF32Zh2047687; Wed, 15 Nov 2017 11:02:35 +0800 (GMT-8) (envelope-from uboot@andestech.com) Received: from app09.andestech.com (10.0.4.97) by ATCPCS16.andestech.com (10.0.1.222) with Microsoft SMTP Server id 14.3.123.3; Wed, 15 Nov 2017 11:13:14 +0800 From: Andes To: , , , Date: Wed, 15 Nov 2017 10:48:22 +0800 Message-ID: <1510714104-20090-3-git-send-email-uboot@andestech.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1510714104-20090-1-git-send-email-uboot@andestech.com> References: <1510714104-20090-1-git-send-email-uboot@andestech.com> MIME-Version: 1.0 X-Originating-IP: [10.0.4.97] X-DNSRBL: X-MAIL: ATCSQR.andestech.com vAF32Zh2047687 Subject: [U-Boot] [PATCH] enable debug uart 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" From: rick --- common/board_f.c | 2 ++ configs/adp-ae3xx_defconfig | 5 +++++ drivers/serial/Kconfig | 8 ++++++++ drivers/serial/ns16550.c | 5 +++-- include/debug_uart.h | 2 ++ lib/display_options.c | 2 ++ 6 files changed, 22 insertions(+), 2 deletions(-) mode change 100644 => 100755 common/board_f.c mode change 100644 => 100755 common/init/board_init.c mode change 100644 => 100755 configs/adp-ae3xx_defconfig mode change 100644 => 100755 drivers/serial/Kconfig mode change 100644 => 100755 drivers/serial/ns16550.c mode change 100644 => 100755 include/debug_uart.h mode change 100644 => 100755 lib/display_options.c diff --git a/common/board_f.c b/common/board_f.c old mode 100644 new mode 100755 index 104d144..1024987 --- a/common/board_f.c +++ b/common/board_f.c @@ -902,6 +902,8 @@ static const init_fnc_t init_sequence_f[] = { void board_init_f(ulong boot_flags) { +//printf("board_init_f\n"); +//while(1); gd->flags = boot_flags; gd->have_console = 0; diff --git a/common/init/board_init.c b/common/init/board_init.c old mode 100644 new mode 100755 diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig old mode 100644 new mode 100755 index db9ee61..02386d6 --- a/configs/adp-ae3xx_defconfig +++ b/configs/adp-ae3xx_defconfig @@ -38,3 +38,8 @@ CONFIG_DM_SPI=y CONFIG_NDS_AE3XX_SPI=y CONFIG_TIMER=y CONFIG_AE3XX_TIMER=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_BASE=0xf0300000 +CONFIG_DEBUG_UART_CLOCK=14745600 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_DEBUG_UART_OFFSET=32 diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig old mode 100644 new mode 100755 index aeed538..34d49be --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -319,6 +319,14 @@ config DEBUG_UART_SHIFT value. Use this value to specify the shift to use, where 0=byte registers, 2=32-bit word registers, etc. +config DEBUG_UART_OFFSET + int "UART register offset" + depends on DEBUG_UART + default 0 if DEBUG_UART + help + Offset to apply to the mapbase from the start of the registers. + + config DEBUG_UART_BOARD_INIT bool "Enable board-specific debug UART init" depends on DEBUG_UART diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c old mode 100644 new mode 100755 index c702304..b67af3d --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -31,8 +31,9 @@ DECLARE_GLOBAL_DATA_PTR; #define serial_out(x, y) out_le32(y, x) #define serial_in(y) in_le32(y) #else -#define serial_out(x, y) writeb(x, y) -#define serial_in(y) readb(y) +@ +#define serial_out(x, y) writeb(x, y+CONFIG_SYS_NS16550_REG_OFFSET) +#define serial_in(y) readb(y+CONFIG_SYS_NS16550_REG_OFFSET) #endif #endif /* !CONFIG_DM_SERIAL */ diff --git a/include/debug_uart.h b/include/debug_uart.h old mode 100644 new mode 100755 index 6f0b0c5..a369fb2 --- a/include/debug_uart.h +++ b/include/debug_uart.h @@ -113,11 +113,13 @@ void printhex8(uint value); #define serial_dout(reg, value) \ serial_out_shift((char *)com_port + \ + CONFIG_DEBUG_UART_OFFSET + \ ((char *)reg - (char *)com_port) * \ (1 << CONFIG_DEBUG_UART_SHIFT), \ CONFIG_DEBUG_UART_SHIFT, value) #define serial_din(reg) \ serial_in_shift((char *)com_port + \ + CONFIG_DEBUG_UART_OFFSET + \ ((char *)reg - (char *)com_port) * \ (1 << CONFIG_DEBUG_UART_SHIFT), \ CONFIG_DEBUG_UART_SHIFT) diff --git a/lib/display_options.c b/lib/display_options.c old mode 100644 new mode 100755 index 4ea27ca..8ee63ce --- a/lib/display_options.c +++ b/lib/display_options.c @@ -41,6 +41,8 @@ char *display_options_get_banner(bool newlines, char *buf, int size) int display_options(void) { +printf("display_options\n"); +//while(1); char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; display_options_get_banner(true, buf, sizeof(buf));