From patchwork Tue Sep 13 07:10:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 114455 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 77AB8B71CC for ; Tue, 13 Sep 2011 17:15:13 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BB60028359; Tue, 13 Sep 2011 09:14:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 zPRkrvS7YJDy; Tue, 13 Sep 2011 09:14:00 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F2FF5282F9; Tue, 13 Sep 2011 09:12:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A7DD228342 for ; Tue, 13 Sep 2011 09:12:25 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 igY728etwZZ8 for ; Tue, 13 Sep 2011 09:12:24 +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-bw0-f44.google.com (mail-bw0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id AD0F428203 for ; Tue, 13 Sep 2011 09:11:11 +0200 (CEST) Received: by mail-bw0-f44.google.com with SMTP id q10so195011bka.3 for ; Tue, 13 Sep 2011 00:11:11 -0700 (PDT) Received: by 10.204.131.71 with SMTP id w7mr2306276bks.168.1315897871085; Tue, 13 Sep 2011 00:11:11 -0700 (PDT) Received: from localhost ([178.23.216.97]) by mx.google.com with ESMTPS id i5sm462421bkd.0.2011.09.13.00.11.09 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Sep 2011 00:11:10 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de Date: Tue, 13 Sep 2011 09:10:19 +0200 Message-Id: <1315897821-23049-25-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.5.5.1 In-Reply-To: <1315897821-23049-24-git-send-email-monstr@monstr.eu> References: <1315897821-23049-1-git-send-email-monstr@monstr.eu> <1315897821-23049-2-git-send-email-monstr@monstr.eu> <1315897821-23049-3-git-send-email-monstr@monstr.eu> <1315897821-23049-4-git-send-email-monstr@monstr.eu> <1315897821-23049-5-git-send-email-monstr@monstr.eu> <1315897821-23049-6-git-send-email-monstr@monstr.eu> <1315897821-23049-7-git-send-email-monstr@monstr.eu> <1315897821-23049-8-git-send-email-monstr@monstr.eu> <1315897821-23049-9-git-send-email-monstr@monstr.eu> <1315897821-23049-10-git-send-email-monstr@monstr.eu> <1315897821-23049-11-git-send-email-monstr@monstr.eu> <1315897821-23049-12-git-send-email-monstr@monstr.eu> <1315897821-23049-13-git-send-email-monstr@monstr.eu> <1315897821-23049-14-git-send-email-monstr@monstr.eu> <1315897821-23049-15-git-send-email-monstr@monstr.eu> <1315897821-23049-16-git-send-email-monstr@monstr.eu> <1315897821-23049-17-git-send-email-monstr@monstr.eu> <1315897821-23049-18-git-send-email-monstr@monstr.eu> <1315897821-23049-19-git-send-email-monstr@monstr.eu> <1315897821-23049-20-git-send-email-monstr@monstr.eu> <1315897821-23049-21-git-send-email-monstr@monstr.eu> <1315897821-23049-22-git-send-email-monstr@monstr.eu> <1315897821-23049-23-git-send-email-monstr@monstr.eu> <1315897821-23049-24-git-send-email-monstr@monstr.eu> Subject: [U-Boot] [PATCH 24/26] microblaze: Enable SERIAL_MULTI X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Enable support for SERIAL_MULTI. Microblaze can use uart16550 and uartlite drivers. Signed-off-by: Michal Simek --- Note: Follow serial.h conding style. --- arch/microblaze/lib/board.c | 4 ++++ include/configs/microblaze-generic.h | 2 ++ include/serial.h | 2 +- 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index 8865a60..4e195ac 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -31,6 +31,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -109,6 +110,9 @@ void board_init (void) monitor_flash_len = __end - __text_start; +#ifdef CONFIG_SERIAL_MULTI + serial_initialize(); +#endif /* * The Malloc area is immediately below the monitor copy in DRAM * aka CONFIG_SYS_MONITOR_BASE - Note there is no need for reloc_off diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index a811b76..c526006 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -31,6 +31,8 @@ #define CONFIG_MICROBLAZE 1 #define MICROBLAZE_V5 1 +#define CONFIG_SERIAL_MULTI 1 + /* uart */ #ifdef XILINX_UARTLITE_BASEADDR # define CONFIG_XILINX_UARTLITE diff --git a/include/serial.h b/include/serial.h index 5926244..f047d2f 100644 --- a/include/serial.h +++ b/include/serial.h @@ -31,7 +31,7 @@ extern struct serial_device * default_serial_console (void); defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) || \ defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \ defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) || \ - defined(CONFIG_TEGRA2) + defined(CONFIG_TEGRA2) || defined(CONFIG_MICROBLAZE) extern struct serial_device serial0_device; extern struct serial_device serial1_device; #if defined(CONFIG_SYS_NS16550_SERIAL)