bdinfo: net: ppc: Drop bi_enet1addr and other similar info

These values were 'old' in 2013 so it should be safe to remove them. They
are never set in U-Boot anyway, so the values will always be zero.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/common/board_r.c b/common/board_r.c
index fa57fa9b699399d91d20a16199d68c51993328b6..5e924322b2f0a8795f6ef199cd567b4306ec972d 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -537,21 +537,7 @@ static int initr_ethaddr(void)
 
        /* kept around for legacy kernels only ... ignore the next section */
        eth_env_get_enetaddr("ethaddr", bd->bi_enetaddr);
-#ifdef CONFIG_HAS_ETH1
-       eth_env_get_enetaddr("eth1addr", bd->bi_enet1addr);
-#endif
-#ifdef CONFIG_HAS_ETH2
-       eth_env_get_enetaddr("eth2addr", bd->bi_enet2addr);
-#endif
-#ifdef CONFIG_HAS_ETH3
-       eth_env_get_enetaddr("eth3addr", bd->bi_enet3addr);
-#endif
-#ifdef CONFIG_HAS_ETH4
-       eth_env_get_enetaddr("eth4addr", bd->bi_enet4addr);
-#endif
-#ifdef CONFIG_HAS_ETH5
-       eth_env_get_enetaddr("eth5addr", bd->bi_enet5addr);
-#endif
+
        return 0;
 }
 #endif /* CONFIG_CMD_NET */

diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h
index b496e5596496a12bb6930fd2857917f1f5ace8c0..008ebf3ca329fefc0e28214fd0911c2eef6cd14f 100644 (file)
--- a/include/asm-generic/u-boot.h
+++ b/include/asm-generic/u-boot.h
@@ -68,23 +68,6 @@ typedef struct bd_info {
        unsigned long bi_vcofreq;       /* vco Freq in MHz */
        unsigned long bi_flbfreq;       /* Flexbus Freq in MHz */
 #endif
-
-#ifdef CONFIG_HAS_ETH1
-       unsigned char   bi_enet1addr[6];        /* OLD: see README.enetaddr */
-#endif
-#ifdef CONFIG_HAS_ETH2
-       unsigned char   bi_enet2addr[6];        /* OLD: see README.enetaddr */
-#endif
-#ifdef CONFIG_HAS_ETH3
-       unsigned char   bi_enet3addr[6];        /* OLD: see README.enetaddr */
-#endif
-#ifdef CONFIG_HAS_ETH4
-       unsigned char   bi_enet4addr[6];        /* OLD: see README.enetaddr */
-#endif
-#ifdef CONFIG_HAS_ETH5
-       unsigned char   bi_enet5addr[6];        /* OLD: see README.enetaddr */
-#endif
-
        ulong           bi_arch_number; /* unique id for this board */
        ulong           bi_boot_params; /* where this board expects params */
 #ifdef CONFIG_NR_DRAM_BANKS