From patchwork Wed Jul 27 05:31:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 653089 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 3rzkCn5jW3z9t1f for ; Wed, 27 Jul 2016 15:32:53 +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=AbldufiL; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6047EA79D4; Wed, 27 Jul 2016 07:32:43 +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 Cxr383txgfG0; Wed, 27 Jul 2016 07:32:43 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B36213A2E; Wed, 27 Jul 2016 07:32:21 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 96E77B3803 for ; Wed, 27 Jul 2016 07:32:12 +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 khNhc0rHJdNw for ; Wed, 27 Jul 2016 07:32:12 +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-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by theia.denx.de (Postfix) with ESMTPS id 45C77A75F8 for ; Wed, 27 Jul 2016 07:32:09 +0200 (CEST) Received: by mail-lf0-f65.google.com with SMTP id l69so1446860lfg.1 for ; Tue, 26 Jul 2016 22:32:09 -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=s3A17s4+5nb84SgLR06kHsV1XwL9aF3n/I+cKsxG0CM=; b=AbldufiL9TGlhpa52UX4/nvnES1uhHLT+EfO9AkkILgoLNHEcUhIMiK/iVDb9Kcs+I dX0IjfSNp2SKseZ0jFYNjEAtmNd9FjhNs+a8ZsyxrrzkwQj89zlHQwjWP2PywarS+eGe iFIIqQVqnyw/IMc+RvNuvhWH9C9KYarpUq4Pas24WHGNgZk5DQw3i4UCle3Ax7XGb7I0 U8IKq94i5LXqn0BmMy+2vRJVF6p+59icKXxdVPLsUDstB2U9KuceTSnlAr4N9dEjdHtC LQhujZj6jpQQCV585Afnv043NXEgmUN2sQmq/ZxV3IIkNEVmBXjblhpAX3nPIviJo4Kd 1Hzw== 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=s3A17s4+5nb84SgLR06kHsV1XwL9aF3n/I+cKsxG0CM=; b=D8xe+Tt654ecCZLZHgMUjb4CtiWpSoaN2lfer4qQLYE7QlJWCZwvudQ4YDSAuUcFP1 GJt7hb9YZoZHe9LSE+juJsIYl9J7WmWdAsJCgLSEQXEpJmFMvxz0P2m+0hurRtnuQzbg DOjI5+IQQu6uKdhq/80P8/ygLNUEp9kKMApf+hIdrS0G5Oc5J06o+VcUL6nagXFcXWwH sh6Mbv8c7827qwXHAmhPrnge0jv1DKLQ3XGKUtBHpfcO9nHkE+cxGtAit7XIDouvwTIQ B6Ei4Nx6mXYLedaAN0pC/P5NTrdzeZXaI1UYahbjkLJ+szZj3uOsX/90Gl8+w2nZ6F1l lmGw== X-Gm-Message-State: AEkooutookzKMmqcNVB7BrMplToMDTnmwwWHqbPGXgZ8R3u4O6mA2ryRixUmonbjj/FHNQ== X-Received: by 10.25.24.85 with SMTP id o82mr9345012lfi.23.1469597529244; Tue, 26 Jul 2016 22:32:09 -0700 (PDT) Received: from octofox.metropolis ([5.19.183.212]) by smtp.gmail.com with ESMTPSA id d11sm667109lfe.13.2016.07.26.22.32.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Jul 2016 22:32:08 -0700 (PDT) From: Max Filippov To: u-boot@lists.denx.de Date: Wed, 27 Jul 2016 08:31:49 +0300 Message-Id: <1469597511-19760-6-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 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 --- cmd/bdinfo.c | 113 +++++++++++++++++++---------------------------------------- 1 file changed, 36 insertions(+), 77 deletions(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index f89de5f..ab56ea5 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -121,6 +121,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) { @@ -178,24 +201,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(); @@ -216,11 +222,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; @@ -276,10 +278,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; } @@ -309,20 +308,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; @@ -344,9 +330,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; @@ -361,9 +345,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); @@ -380,9 +362,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; @@ -442,11 +422,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; } @@ -472,8 +448,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); @@ -489,11 +464,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 @@ -509,11 +481,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; @@ -527,12 +495,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; @@ -545,11 +508,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;