diff mbox series

[24/36] bdinfo: net: ppc: Drop bi_enet1addr and other similar info

Message ID 20200504231732.98778-16-sjg@chromium.org
State Superseded
Headers show
Series Tidy up the 'bd' command. | expand

Commit Message

Simon Glass May 4, 2020, 11:17 p.m. UTC
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 at chromium.org>
---

 common/board_r.c             | 16 +---------------
 include/asm-generic/u-boot.h | 17 -----------------
 2 files changed, 1 insertion(+), 32 deletions(-)

Comments

Bin Meng May 6, 2020, 8:09 a.m. UTC | #1
On Tue, May 5, 2020 at 7:19 AM Simon Glass <sjg at chromium.org> wrote:
>
> 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 at chromium.org>
> ---
>
>  common/board_r.c             | 16 +---------------
>  include/asm-generic/u-boot.h | 17 -----------------
>  2 files changed, 1 insertion(+), 32 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
Stefan Roese May 6, 2020, 3:09 p.m. UTC | #2
On 05.05.20 01:17, Simon Glass wrote:
> 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 at chromium.org>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
> 
>   common/board_r.c             | 16 +---------------
>   include/asm-generic/u-boot.h | 17 -----------------
>   2 files changed, 1 insertion(+), 32 deletions(-)
> 
> diff --git a/common/board_r.c b/common/board_r.c
> index d9015cd057..4876afba6b 100644
> --- a/common/board_r.c
> +++ b/common/board_r.c
> @@ -525,21 +525,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 be0014c3b3..0ec4522653 100644
> --- a/include/asm-generic/u-boot.h
> +++ b/include/asm-generic/u-boot.h
> @@ -67,23 +67,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
> 


Viele Gr??e,
Stefan
diff mbox series

Patch

diff --git a/common/board_r.c b/common/board_r.c
index d9015cd057..4876afba6b 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -525,21 +525,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 be0014c3b3..0ec4522653 100644
--- a/include/asm-generic/u-boot.h
+++ b/include/asm-generic/u-boot.h
@@ -67,23 +67,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