From patchwork Sat Oct 17 21:07:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 531883 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 8083B1402A9 for ; Sun, 18 Oct 2015 08:08:22 +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=e3eGxyVi; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B179F4B6E3; Sat, 17 Oct 2015 23:08:01 +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 81-3aI9InY0s; Sat, 17 Oct 2015 23:08:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ABA464B6EB; Sat, 17 Oct 2015 23:07:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C4CB34B663 for ; Sat, 17 Oct 2015 23:07:25 +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 jCk_KYreaZcj for ; Sat, 17 Oct 2015 23:07:25 +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-f171.google.com (mail-io0-f171.google.com [209.85.223.171]) by theia.denx.de (Postfix) with ESMTPS id 350474B660 for ; Sat, 17 Oct 2015 23:07:15 +0200 (CEST) Received: by iofz202 with SMTP id z202so12780893iof.2 for ; Sat, 17 Oct 2015 14:07:14 -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=iVUV+pSdj0O8izdTL/LqDYUs2CKLj+66osRuEj3L/mo=; b=e3eGxyVikKPb74l3gQYlpxAMrOnAMuBC7LJXkanqqmerrSlHhWm/Z64S7mmjhy1430 c8AOHhcGDTM8p4wvzFNMTQv7rq8oIaOWpM3QNieShvWZBt+kt/+nyysdMjsXSNNZgSGP 9lMcgi3+oYcrrenoxWHmCZgsNJZM8GuCtQtKpNw4bF1dIZvQClqqNzYFiCq1nUE6UDwQ zcBaTaoMnZ3hafllS8yj68ca9BHTYuU0R+Ogv/CGS6CNvwFfZDzUTGk9gPv04uxQ29cl JtBGmAOoDhBmQYOlhsvj4wJO+dPLtEN9+I8bJYTbgfLQm0wjVl7O1W0NV+B/loWpmnmz 7RsQ== 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=iVUV+pSdj0O8izdTL/LqDYUs2CKLj+66osRuEj3L/mo=; b=DGEnqoaHQH86I/QwrpjFH5BO2DVeSN7OXmFfdVtOAHYClh6BRFSm/unC/JGbWfT8Lm QJnj52lvYlu0a9o5IwGpYg96qZ1wZcDRTztBYIrec4vXkwv/bCOLh3EkVuKpaLs+3auv O44/nK5nJGxIKjms3OLHIKFVdkltGVkRO1SmZ5YQY7H8KfzkbD47zkQovDqTmvSn3zq4 ePjNwcr2DQUl//QWYVVrCH6eMRN4OiZRgndFrjPi8pOu8Y1Jksw0hGcM9oeJARqBmBlv C8gyNHBasmxYAt/ja+hY7rIWvyvZbGY0OiGXyXO5n+WLipi4x1OSbbIZYi3HM4ulhvna y6dg== X-Gm-Message-State: ALoCoQnNzoKJTKiFqGGOXBYrgy2eYmjOmlNFIrXQrb/8GX7vINaYJ2Pu1TyFX9EQYd3/VmcqdTnA X-Received: by 10.107.162.204 with SMTP id l195mr24185572ioe.196.1445116034333; Sat, 17 Oct 2015 14:07:14 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:1100:dcfe:355a:a49c:d29c]) by smtp.gmail.com with ESMTPSA id u12sm4860898igr.22.2015.10.17.14.07.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Oct 2015 14:07:13 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id EF137221873; Sat, 17 Oct 2015 15:07:10 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 17 Oct 2015 15:07:00 -0600 Message-Id: <1445116021-27296-8-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1445116021-27296-1-git-send-email-sjg@chromium.org> References: <1445116021-27296-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH v3 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 and there is no need to. If we want to do early init 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 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