From patchwork Wed Jul 27 05:31:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 653092 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 3rzkDX6Hyfz9t1f for ; Wed, 27 Jul 2016 15:33:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=0dho4b5b; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1FD5B3A52; Wed, 27 Jul 2016 07:33:06 +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 rHCjPqyvilhj; Wed, 27 Jul 2016 07:33:06 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A8E853A61; Wed, 27 Jul 2016 07:32:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DD81C3A28 for ; Wed, 27 Jul 2016 07:32:20 +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 IZdW4ybvmSrK for ; Wed, 27 Jul 2016 07:32:20 +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-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by theia.denx.de (Postfix) with ESMTPS id 46600A79D4 for ; Wed, 27 Jul 2016 07:32:08 +0200 (CEST) Received: by mail-lf0-f66.google.com with SMTP id f93so1455446lfi.0 for ; Tue, 26 Jul 2016 22:32:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0KTiRqIOag8N24MIuuIwDjp8lLZnzmoOaLnTBzTnfHw=; b=0dho4b5bESYP0clAPh9+P57RGCjMMEqirl5e5ZpygWDzGN26d0WKnN05d4GsBxiKOK bqiPc2osP8eJV3TAawHvkJ6UfgmoCFfr/RoltWTAhV2Im9zxUPVA4IoJUHyiYUpf18ZO 6yYsRf85Rq+AvZharOr6eO7xQoHI66LwvpLRSdYwwgkLD0yNUOj7C9niS8MHQ1a4Fj6P mPMcM41boxt8nUoSW+GyfuNy50pUhnTE9Gk2kIIoobwElV2ekHxbUL1CPoceZUVB5Yek u/+AF44qi+PnxMiA2xY16bHs+l3oOKaIBHCOWXsBED9rfT4yeda7yAfiY2D4sXTRWkd2 bI5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0KTiRqIOag8N24MIuuIwDjp8lLZnzmoOaLnTBzTnfHw=; b=N5KUfJAoeShi/5ClhPf3c8fgzOj3KtmziXAnF9NJVTVIOxEo87yqVO7TbsLsKc7+QS 8+XY6k8UXHO4LP2E3+Xab683B5etjjgOLSg87aVFuYdulk+g2bunxDE83m83bzj/3uL/ +TaozW6GoWL3z3m8mcaOuGxWV6SV7Q9lSNvnP9vAmYG5cGs5DTEJ8Ni4ZgjJGy5VlxGK krx0TCa9iS1UMqZhD25f8P9IqLPOzjvdWj8Ip3b8oxn7BFEjgrupbJkju7qSLNYZIDUe Gk+mpy3/qYkXmcjKmej0dHodn+j9ZHpI4CBH03TiQEUb//8810IjsTiIlHTo7Y9BrE2V 38NQ== X-Gm-Message-State: AEkoousk/Mz9rtyS3cjIm5h3RHG4jhESUDYzBJ+tv7MWICMNu5yuKYoB/+smCey0xrr7PA== X-Received: by 10.25.145.135 with SMTP id t129mr11409690lfd.163.1469597528351; Tue, 26 Jul 2016 22:32:08 -0700 (PDT) Received: from octofox.metropolis ([5.19.183.212]) by smtp.gmail.com with ESMTPSA id d11sm667109lfe.13.2016.07.26.22.32.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Jul 2016 22:32:07 -0700 (PDT) From: Max Filippov To: u-boot@lists.denx.de Date: Wed, 27 Jul 2016 08:31:48 +0300 Message-Id: <1469597511-19760-5-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1469597511-19760-1-git-send-email-jcmvbkbc@gmail.com> References: <1469597511-19760-1-git-send-email-jcmvbkbc@gmail.com> Subject: [U-Boot] [PATCH 4/7] cmd/bdinfo: extract print_bi_flash 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" print_bi_flash outputs flashstart, flashsize and flashoffset lines. Signed-off-by: Max Filippov --- cmd/bdinfo.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 2f37232..f89de5f 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -103,6 +103,24 @@ static inline void print_bi_dram(const bd_t *bd) } } +static inline void print_bi_flash(const bd_t *bd) +{ +#if defined(CONFIG_MICROBLAZE) || defined(CONFIG_SH) + print_num("flash start ", (ulong)bd->bi_flashstart); + print_num("flash size ", (ulong)bd->bi_flashsize); + print_num("flash offset ", (ulong)bd->bi_flashoffset); + +#elif defined(CONFIG_NIOS2) || defined(CONFIG_OPENRISC) + print_num("flash start", (ulong)bd->bi_flashstart); + print_num("flash size", (ulong)bd->bi_flashsize); + print_num("flash offset", (ulong)bd->bi_flashoffset); +#else + print_num("flashstart", (ulong)bd->bi_flashstart); + print_num("flashsize", (ulong)bd->bi_flashsize); + print_num("flashoffset", (ulong)bd->bi_flashoffset); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -117,9 +135,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num("bd address", (ulong)bd); #endif print_bi_mem(bd); - print_num("flashstart", bd->bi_flashstart); - print_num("flashsize", bd->bi_flashsize); - print_num("flashoffset", bd->bi_flashoffset); + print_bi_flash(bd); print_num("sramstart", bd->bi_sramstart); print_num("sramsize", bd->bi_sramsize); #if defined(CONFIG_5xx) || defined(CONFIG_8xx) || \ @@ -193,9 +209,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd; print_bi_dram(bd); - print_num("flash start", (ulong)bd->bi_flashstart); - print_num("flash size", (ulong)bd->bi_flashsize); - print_num("flash offset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd); #if defined(CONFIG_SYS_SRAM_BASE) print_num ("sram start", (ulong)bd->bi_sramstart); @@ -219,9 +233,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd; print_bi_dram(bd); - print_num("flash start ", (ulong)bd->bi_flashstart); - print_num("flash size ", (ulong)bd->bi_flashsize); - print_num("flash offset ", (ulong)bd->bi_flashoffset); + print_bi_flash(bd); #if defined(CONFIG_SYS_SRAM_BASE) print_num("sram start ", (ulong)bd->bi_sramstart); print_num("sram size ", (ulong)bd->bi_sramsize); @@ -279,9 +291,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd; print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd); #if defined(CONFIG_SYS_INIT_RAM_ADDR) print_num("sramstart", (ulong)bd->bi_sramstart); print_num("sramsize", (ulong)bd->bi_sramsize); @@ -333,9 +343,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_boot_params(bd); print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd); print_eth(0); printf("ip_addr = %s\n", getenv("ipaddr")); @@ -352,9 +360,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_boot_params(bd); print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd); print_eth(0); printf("ip_addr = %s\n", getenv("ipaddr")); @@ -373,9 +379,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_boot_params(bd); print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd); print_eth(0); printf("ip_addr = %s\n", getenv("ipaddr")); @@ -437,9 +441,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd; print_bi_mem(bd); - print_num("flash start ", (ulong)bd->bi_flashstart); - print_num("flash size ", (ulong)bd->bi_flashsize); - print_num("flash offset ", (ulong)bd->bi_flashoffset); + print_bi_flash(bd); #if defined(CONFIG_CMD_NET) print_eth(0); @@ -524,9 +526,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd; print_bi_mem(bd); - print_num("flash start", (ulong)bd->bi_flashstart); - print_num("flash size", (ulong)bd->bi_flashsize); - print_num("flash offset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd); #if defined(CONFIG_CMD_NET) print_eth(0);