From patchwork Mon Oct 19 12:50:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 532293 X-Patchwork-Delegate: trini@ti.com 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 90CDF1401AF for ; Mon, 19 Oct 2015 23:51:09 +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=SNqqFIJu; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7255F4B861; Mon, 19 Oct 2015 14:50:46 +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 WJpz6KByJTpS; Mon, 19 Oct 2015 14:50:46 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 347F74B827; Mon, 19 Oct 2015 14:50:31 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7D4394B7E0 for ; Mon, 19 Oct 2015 14:50:14 +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 QyIsjgekoDkJ for ; Mon, 19 Oct 2015 14:50:14 +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-io0-f174.google.com (mail-io0-f174.google.com [209.85.223.174]) by theia.denx.de (Postfix) with ESMTPS id 21BCF4B7D0 for ; Mon, 19 Oct 2015 14:50:12 +0200 (CEST) Received: by ioll68 with SMTP id l68so27727622iol.3 for ; Mon, 19 Oct 2015 05:50:12 -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=3yqufLri/yP2ZqBVMBGVUtfJ0KHAn6pyr50Ein2swvg=; b=SNqqFIJuv67ZZ1BD9tevtkObmqUjanidbMx/Lau7pVWgCro48FKRYvjDZmQwPVMbT6 cuYoPSgTfnM4HqAuL4mh57aLNISTGP02/c9NOUr7o6sZIVtbhinqNNHdmE5dbiN1n7jY xAqi424E8YgToZFdAb0yhxYM01MtqYix9vnfVTx/z7311cQp7pzZAmI0T7W1i4Jnwjc0 ipN1vuDpuCDKBj/vu6RDEQqLXxOyIInr+XSu68DZ9bCY8LpmAZGY1Hz5uqw8eOa9k5Vx 7wqDFj0G8rwoIFhsdVPDI9MtJle/fQnKjxn3IVFqYdm/WOZK15EzyKig6KRqE/g6l0DH VxuQ== 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=3yqufLri/yP2ZqBVMBGVUtfJ0KHAn6pyr50Ein2swvg=; b=T2Q7xFD4y74Mtd0KzwVFToM9uPr/aK1oIR+XbpU99xN+skkbCjA9TSRt+p2+olCDe2 Vi7bHn3IE9DLsbz+l5kFh2kpdq0l6sE3OzTNyvZvgBXu/Lqutc5cJzaka5V54ZTn+Rrr kFv1aal/2+hMBjB9dzeMQFME8UrkSxArdLZHM0RYQk3n+ifS22Y8RFy0Ss+b8tE9HDZQ D7XBfaAPMP9nIrYxmDIN8dVQpOIneJxWhwDHJbhQ2g2euP24ny2/1Pz4lEV4S+7emlvX YyRPJykzthPb8X3uPFE8nIIBMZhQiiy02cyXd01U87iLEc9bJ9DxgMxnLU4/QdhCq3Yy HL6g== X-Gm-Message-State: ALoCoQmbNIraKml5vibGoL3sgEGPD7MqfhUElRocES5YUjhDaXVwXtsfz0znNFgjHvVoz1tLiVAJ X-Received: by 10.107.39.6 with SMTP id n6mr30563577ion.193.1445259011686; Mon, 19 Oct 2015 05:50:11 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id bc4sm7735792igb.2.2015.10.19.05.50.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Oct 2015 05:50:10 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id A29ED2218EF; Mon, 19 Oct 2015 06:50:06 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 19 Oct 2015 06:50:02 -0600 Message-Id: <1445259003-15896-8-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1445259003-15896-1-git-send-email-sjg@chromium.org> References: <1445259003-15896-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH v4 7/8] zynq: Move SPL console init out of board_init_f() 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" We should not init the console this early since it precludes using driver model for the UART, since it is not set up at the start of board_init_f(). See the README for more information. The debug UART does not have this restriction. If we want to do early init with the console on it can be done in spl_board_init(). Move the preloader_console_init() call from board_init_f() to board_init_r(). Signed-off-by: Simon Glass Tested-by: Masahiro Yamada Tested-by: Michal Simek --- Changes in v4: - Update commit message to address Albert's comments Changes in v3: - Rebase to master Changes in v2: None arch/arm/mach-zynq/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c index e7df6d3..7bdac3b 100644 --- a/arch/arm/mach-zynq/spl.c +++ b/arch/arm/mach-zynq/spl.c @@ -20,7 +20,6 @@ void board_init_f(ulong dummy) /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); - preloader_console_init(); arch_cpu_init(); board_init_r(NULL, 0); } @@ -28,6 +27,7 @@ void board_init_f(ulong dummy) #ifdef CONFIG_SPL_BOARD_INIT void spl_board_init(void) { + preloader_console_init(); board_init(); } #endif