From patchwork Thu Jul 28 00:57:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 653516 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 3s0D5s1sPKz9t0l for ; Thu, 28 Jul 2016 10:59:29 +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=NLOyz2+9; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5C529A76AB; Thu, 28 Jul 2016 02:59:17 +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 00l6YtZFaLWE; Thu, 28 Jul 2016 02:59:17 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B6D25A75DE; Thu, 28 Jul 2016 02:58:45 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4E3B3A7624 for ; Thu, 28 Jul 2016 02:58:34 +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 7iYhbHyJKK65 for ; Thu, 28 Jul 2016 02:58:34 +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 369A0A755D for ; Thu, 28 Jul 2016 02:58:29 +0200 (CEST) Received: by mail-lf0-f66.google.com with SMTP id 33so2890374lfw.3 for ; Wed, 27 Jul 2016 17:58:29 -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=/OnzbuP4megQZPPLK7QN/XJNqtiCUE+SKhYQxHKYo18=; b=NLOyz2+9G/Zsq4pMSG2feJ1iwkSwVRa5gPQfTQf8ADjOVBPye9xN9jKoirNaEpCuhf vYFehICEn5Zani2XLmxjrmTJ5WkVosayiUWYY54az3Tw7vduVNIJdCleYM5T92Ha44v8 yC+JUaVaJLkAOsDNEn1a7lkC9d7k55mXv9eTpQTwNMvWN1b7TIj8+KOhHBnwmQt02kTq RL51R3qJeDT6WSZgDtLK4yegv57+zt0b+LgjVZHv1YFTeE4v+8rAYlB/j9Plybvrp3T4 KaIrxI+6qj0A24UHuuaYev1c0GbHVB+6DmKMplhZsiyaf4qDaDgtTTgQhSPgFMjazSyC WCEg== 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=/OnzbuP4megQZPPLK7QN/XJNqtiCUE+SKhYQxHKYo18=; b=XXmcE56WK0mLb9A/bOdPgQiTBcOahrcoMgg5NvkACGw1wHl40XOIP6pO+C3XPwXpnR 6Muhf2aL+R94fYeuwtECKzPjwo8C03ApFLJrJ9EbQltKH+8r3Dj69MiXnHgUTblWNjho BwexyfwpO4n07CKVc7fZZBGP6STp25aoZCDAWwSqVyqhKvXbFkYV8MBW1HsnQDzTtT3X Bh0vJokAgydXSu/SWSS7yLQMiHadLy92CPVujRVo0by82XNuoJk264EhXMt4xdV4n7Ga oh4APO28KXuqspUHaB51NibN1a/B+lnLw3duqkVNsheuXT6hyQilFa7+d9N9hafwu2lI 97hg== X-Gm-Message-State: AEkoouuZlWbq2M2VSGWi1uped/02Kh36lxGFUlQpxM7Aj++C0gKR15LrlC0t1F4OfXe87A== X-Received: by 10.46.1.92 with SMTP id 89mr12205957ljb.21.1469667508858; Wed, 27 Jul 2016 17:58:28 -0700 (PDT) Received: from octofox.metropolis ([5.19.183.212]) by smtp.gmail.com with ESMTPSA id l10sm1420720lfd.19.2016.07.27.17.58.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jul 2016 17:58:28 -0700 (PDT) From: Max Filippov To: u-boot@lists.denx.de Date: Thu, 28 Jul 2016 03:57:22 +0300 Message-Id: <1469667444-4686-6-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1469667444-4686-1-git-send-email-jcmvbkbc@gmail.com> References: <1469667444-4686-1-git-send-email-jcmvbkbc@gmail.com> Subject: [U-Boot] [PATCH v2 5/7] cmd/bdinfo: extract print_eth_ip_addr 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_eth_ip_addr outputs eth configurations for up to 6 interfaces and configured IP address. Signed-off-by: Max Filippov Reviewed-by: Tom Rini Reviewed-by: Simon Glass Acked-by: Joe Hershberger --- cmd/bdinfo.c | 113 +++++++++++++++++++---------------------------------------- 1 file changed, 36 insertions(+), 77 deletions(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 0bef930..4ffb757 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -123,6 +123,29 @@ static inline void print_bi_flash(const bd_t *bd) #endif } +static inline void print_eth_ip_addr(void) +{ +#if defined(CONFIG_CMD_NET) + print_eth(0); +#if defined(CONFIG_HAS_ETH1) + print_eth(1); +#endif +#if defined(CONFIG_HAS_ETH2) + print_eth(2); +#endif +#if defined(CONFIG_HAS_ETH3) + print_eth(3); +#endif +#if defined(CONFIG_HAS_ETH4) + print_eth(4); +#endif +#if defined(CONFIG_HAS_ETH5) + print_eth(5); +#endif + printf("IP addr = %s\n", getenv("ipaddr")); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -180,24 +203,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif #endif - print_eth(0); -#if defined(CONFIG_HAS_ETH1) - print_eth(1); -#endif -#if defined(CONFIG_HAS_ETH2) - print_eth(2); -#endif -#if defined(CONFIG_HAS_ETH3) - print_eth(3); -#endif -#if defined(CONFIG_HAS_ETH4) - print_eth(4); -#endif -#if defined(CONFIG_HAS_ETH5) - print_eth(5); -#endif - - printf("IP addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %6u bps\n", gd->baudrate); print_num("relocaddr", gd->relocaddr); board_detail(); @@ -218,11 +224,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num ("sram size", (ulong)bd->bi_sramsize); #endif -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif - + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); return 0; @@ -278,10 +280,7 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) printf("CONFIG_SYS_GBL_DATA_OFFSET = 0x%x (%d)\n", CONFIG_SYS_GBL_DATA_OFFSET, GENERATED_GBL_DATA_SIZE); -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %6u bps\n", gd->baudrate); return 0; } @@ -311,20 +310,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("inpfreq", bd->bi_inpfreq); print_mhz("vcofreq", bd->bi_vcofreq); #endif -#if defined(CONFIG_CMD_NET) - print_eth(0); -#if defined(CONFIG_HAS_ETH1) - print_eth(1); -#endif -#if defined(CONFIG_HAS_ETH2) - print_eth(2); -#endif -#if defined(CONFIG_HAS_ETH3) - print_eth(3); -#endif - - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); return 0; @@ -346,9 +332,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_bi_flash(bd); - - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); return 0; @@ -363,9 +347,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_bi_flash(bd); - - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); print_num("relocaddr", gd->relocaddr); print_num("reloc off", gd->reloc_off); @@ -382,9 +364,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_bi_flash(bd); - - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); return 0; @@ -444,11 +424,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_mem(bd); print_bi_flash(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); return 0; } @@ -474,8 +450,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_dram(bd); #if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); print_mhz("ethspeed", bd->bi_ethspeed); #endif printf("baudrate = %u bps\n", gd->baudrate); @@ -491,11 +466,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_boot_params(bd); print_bi_dram(bd); + print_eth_ip_addr(); -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) print_num("FB base ", gd->fb_base); #endif @@ -511,11 +483,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num("arch_number", bd->bi_arch_number); print_bi_boot_params(bd); print_bi_dram(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); return 0; @@ -529,12 +497,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_mem(bd); print_bi_flash(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif - + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); return 0; @@ -547,11 +510,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd; print_bi_mem(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %d bps\n", gd->baudrate); return 0;