From patchwork Mon Feb 20 08:32:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 94188 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1234446qgi; Mon, 20 Feb 2017 01:10:52 -0800 (PST) X-Received: by 10.223.167.138 with SMTP id j10mr12079908wrc.178.1487581852790; Mon, 20 Feb 2017 01:10:52 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id 36si23131194wrk.321.2017.02.20.01.10.52; Mon, 20 Feb 2017 01:10:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4655FB3927; Mon, 20 Feb 2017 09:53:14 +0100 (CET) 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 Lslh6iZRksEx; Mon, 20 Feb 2017 09:53:14 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 79A15B3950; Mon, 20 Feb 2017 09:47:12 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DDB45B3AB0 for ; Mon, 20 Feb 2017 09:47:04 +0100 (CET) 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 z4LGIvzQUmFl for ; Mon, 20 Feb 2017 09:47:04 +0100 (CET) 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 conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by theia.denx.de (Postfix) with ESMTPS id 87C43B3F9C for ; Mon, 20 Feb 2017 09:32:42 +0100 (CET) Received: from pug.jp.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id v1K8WZs2017289; Mon, 20 Feb 2017 17:32:35 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v1K8WZs2017289 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1487579556; bh=VvN5FoHpkmwuHA1yAvvNN2fNVlreXCJFv6oKMZ1dAQA=; h=From:To:Cc:Subject:Date:From; b=X8Ep27YYWKpvKBVvQ1kGYDw3YCIriKGCl4NKSgPIkSGCjrKKl8zByHvDJvbYQvZnR lpzre6sgbzDqaMuEVg2sc4MAnQt/d/yGRXwuP7m9seEO2/oP8q3h6Kwu+Pdwa6FEsd bOCuWMGvUXhQjqlGsZ3NZ2jyUa9g7nRcYmomXJwI4YsxT7RiPcqkUKORbLG7Zzk2Tv pBlA9JHW29pGZum4JF+ZuaVDTvWStuRFLwOLaPaLXK+utXk/LhF2h0VPcpoxV8Aj7A dd9sZToa1+yxB7vXgvnfWJEvLWbLXWEd344bVad+0ZPiSmsigj5IzqdZiCdMp+663r D+cRNz/brprRw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 20 Feb 2017 17:32:19 +0900 Message-Id: <1487579539-22178-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Cc: Albert Aribaud Subject: [U-Boot] [PATCH] ARM: uniphier: print Support Card info very late 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" Since commit 26b09c022ab6 ("ARM: uniphier: move SBC and Support Card init code to U-Boot proper"), the System Bus is initialized by board_init(). The show_board_info() is called from board_init_f() by default, so the revision register of the Micro Support Card may not be accessed at this point. Show its revision after the System Bus is initialized. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/micro-support-card.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) -- 2.7.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c index 2b231ac..8a30341 100644 --- a/arch/arm/mach-uniphier/micro-support-card.c +++ b/arch/arm/mach-uniphier/micro-support-card.c @@ -43,18 +43,13 @@ static int support_card_show_revision(void) revision &= 0xff; /* revision 3.6.x card changed the revision format */ - printf("(CPLD version %s%d.%d)\n", revision >> 4 == 6 ? "3." : "", + printf("SC: Micro Support Card (CPLD version %s%d.%d)\n", + revision >> 4 == 6 ? "3." : "", revision >> 4, revision & 0xf); return 0; } -int checkboard(void) -{ - printf("SC: Micro Support Card "); - return support_card_show_revision(); -} - void support_card_init(void) { support_card_reset(); @@ -64,6 +59,8 @@ void support_card_init(void) */ udelay(200); support_card_reset_deassert(); + + support_card_show_revision(); } #if defined(CONFIG_SMC911X)