From patchwork Wed Jul 27 05:31:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 653088 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 3rzkCZ3Mvhz9t1f for ; Wed, 27 Jul 2016 15:32:42 +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=T15Ltwlo; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C7D633A1D; Wed, 27 Jul 2016 07:32:35 +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 8Gfu8bCLDW23; Wed, 27 Jul 2016 07:32:35 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5761EA799E; Wed, 27 Jul 2016 07:32:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6E385A7895 for ; Wed, 27 Jul 2016 07:32:11 +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 bHtS2gl9SckH for ; Wed, 27 Jul 2016 07:32:11 +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-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by theia.denx.de (Postfix) with ESMTPS id 29B56A75F2 for ; Wed, 27 Jul 2016 07:32:06 +0200 (CEST) Received: by mail-lf0-f67.google.com with SMTP id l89so1449037lfi.2 for ; Tue, 26 Jul 2016 22:32:06 -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=DhnvUhr2/EutX55zke0etOz+J9QV903B/QWuifqGjCs=; b=T15LtwlokIt/hgK+bPuCgdO+h7kbSGwzVU4LdMpFLi1OWU4mAhdivz7BeDV+9kI9OJ SEiVJhH/TB77K8roLBVEpA167OM93zykDR+n1nERJnpAimEvSqZGqNaaYQ6TIAOhJL7D G9Yce5TLQJ30BEf/caDh+dIBgIfSlyVMbEDNToyeskLRgMa1DHmYEgKK+MhPTqvQf9ey f7ldfC32i2Z7Y9z8E9Ajm9BKjm2Y1zEstlhh92agXWMeDG1RD5OEXuhqU1IU1m/koWOd fzL6KRTvybo9YKOcoeY3CVnVCOBxXMzkD81TMi94NVTsGDvYz5dqVKYLpcYtRAvOmhwB USGA== 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=DhnvUhr2/EutX55zke0etOz+J9QV903B/QWuifqGjCs=; b=DkBeTqwG51rm1V41XVeIx/cbM6p89T3PgSi5xa0+XJAwcNHOir5+e8o6pXjkRLv/MD /10P/0+gv1Ray8VYLV0rQheactnBi90VwxKkbTOkpDj3aXUt4yCbwPLZ2m+0VyS0c8Ua m+GwJyEAczR9Y54+bgwdLaP8Dy7uLR8rnQ2aM5PQ52gt7m/eu1Z5xfFIyuyWl9KsWZSR byk4J+bKoaipMCkd8GDswvGNd4CrbN7LS+ATv50Dy66VmLRJaHA1Oq0ZI/gYda1RH2fs tvRXqoSZ/w5Aqs+kcsaP4aDQoGKoAST36Sf5Ztmc8hX/pyV3/ktzMB+fJ9vn4S1qyUZ/ ZzNA== X-Gm-Message-State: AEkoousYGlHQEAe0/SDWDpig+/4THzORe9tpUjytMqr13VCKg2K7ejpj+Y+nLczPKoWrhA== X-Received: by 10.25.42.82 with SMTP id q79mr11310200lfq.102.1469597526509; Tue, 26 Jul 2016 22:32:06 -0700 (PDT) Received: from octofox.metropolis ([5.19.183.212]) by smtp.gmail.com with ESMTPSA id d11sm667109lfe.13.2016.07.26.22.32.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Jul 2016 22:32:05 -0700 (PDT) From: Max Filippov To: u-boot@lists.denx.de Date: Wed, 27 Jul 2016 08:31:46 +0300 Message-Id: <1469597511-19760-3-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 2/7] cmd/bdinfo: extract print_bi_mem 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_mem outputs memstart and memsize lines. Signed-off-by: Max Filippov --- cmd/bdinfo.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 60aaafb..df68b58 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -75,6 +75,23 @@ static inline void print_bi_boot_params(const bd_t *bd) print_num("boot_params", (ulong)bd->bi_boot_params); } +static inline void print_bi_mem(const bd_t *bd) +{ +#if defined(CONFIG_SH) + print_num("mem start ", (ulong)bd->bi_memstart); + print_lnum("mem size ", (u64)bd->bi_memsize); +#elif defined(CONFIG_ARC) + print_num("mem start", (ulong)bd->bi_memstart); + print_lnum("mem size", (u64)bd->bi_memsize); +#elif defined(CONFIG_AVR32) + print_num("memstart", (ulong)bd->bi_dram[0].start); + print_lnum("memsize", (u64)bd->bi_dram[0].size); +#else + print_num("memstart", (ulong)bd->bi_memstart); + print_lnum("memsize", (u64)bd->bi_memsize); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -88,8 +105,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef DEBUG print_num("bd address", (ulong)bd); #endif - print_num("memstart", bd->bi_memstart); - print_lnum("memsize", bd->bi_memsize); + print_bi_mem(bd); print_num("flashstart", bd->bi_flashstart); print_num("flashsize", bd->bi_flashsize); print_num("flashoffset", bd->bi_flashoffset); @@ -263,8 +279,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd; - print_num("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + 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); @@ -318,8 +333,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("SCLK", bd->bi_sclk); print_bi_boot_params(bd); - print_num("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + 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); @@ -338,8 +352,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd; print_bi_boot_params(bd); - print_num("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + 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); @@ -360,8 +373,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd; print_bi_boot_params(bd); - print_num("memstart", (ulong)bd->bi_dram[0].start); - print_lnum("memsize", (u64)bd->bi_dram[0].size); + 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); @@ -430,8 +442,8 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd; - print_num("mem start ", (ulong)bd->bi_memstart); - print_lnum("mem size ", (u64)bd->bi_memsize); + + 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); @@ -535,8 +547,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd; - print_num("mem start", (ulong)bd->bi_memstart); - print_lnum("mem size", (u64)bd->bi_memsize); + 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); @@ -557,8 +568,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd; - print_num("mem start", bd->bi_memstart); - print_lnum("mem size", bd->bi_memsize); + print_bi_mem(bd); #if defined(CONFIG_CMD_NET) print_eth(0);