[U-Boot] [PATCH 27/27] remove bi_enet*addr from global data for all arches

Scott Wood scottwood at freescale.com
Mon Feb 16 19:16:38 CET 2009


On Sat, Feb 14, 2009 at 02:23:10AM -0500, Mike Frysinger wrote:
> diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h
> index 7451905..c16f32b 100644
> --- a/include/asm-ppc/u-boot.h
> +++ b/include/asm-ppc/u-boot.h
> @@ -64,7 +64,6 @@ typedef struct bd_info {
>  #endif
>  	unsigned long	bi_bootflags;	/* boot / reboot flag (for LynxOS) */
>  	unsigned long	bi_ip_addr;	/* IP Address */
> -	unsigned char	bi_enetaddr[6];	/* Ethernet adress */
>  	unsigned short	bi_ethspeed;	/* Ethernet speed in Mbps */
>  	unsigned long	bi_intfreq;	/* Internal Freq, in MHz */
>  	unsigned long	bi_busfreq;	/* Bus Freq, in MHz */
> @@ -100,24 +99,6 @@ typedef struct bd_info {
>  	hymod_conf_t	bi_hymod_conf;	/* hymod configuration information */
>  #endif
>  
> -#ifdef CONFIG_HAS_ETH1
> -	/* second onboard ethernet port */
> -	unsigned char   bi_enet1addr[6];
> -#endif
> -#ifdef CONFIG_HAS_ETH2
> -	/* third onboard ethernet port */
> -	unsigned char	bi_enet2addr[6];
> -#endif
> -#ifdef CONFIG_HAS_ETH3
> -	unsigned char   bi_enet3addr[6];
> -#endif
> -#ifdef CONFIG_HAS_ETH4
> -	unsigned char   bi_enet4addr[6];
> -#endif
> -#ifdef CONFIG_HAS_ETH5
> -	unsigned char   bi_enet5addr[6];
> -#endif
> -
>  #if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \
>      defined(CONFIG_405EZ) || defined(CONFIG_440GX) || \
>      defined(CONFIG_440EP) || defined(CONFIG_440GR) || \

This will break compatibility with pre-device-tree kernels.

bd_t is a public interface, albeit a deprecated one.

-Scott


More information about the U-Boot mailing list