[U-Boot-Users] [PATCH 3/7] sbc8560: define eth0 and eth1 instead of eth1 and eth2

[Ben Warren <biggerbadderben@gmail.com>]

Paul Gortmaker wrote:
> The existing config doesn't define CONFIG_HAS_ETH0, and so the
> fdt support doesn't update the zeros in the dtb local-mac with
> real data from the u-boot env.  Since the existing config is
> tailored to just two interfaces, get rid of the ETH2 definitions
> at the same time.
>
> Also don't include any end user specific data into the environment
> by default -- things like MAC address, network parameters etc. need
> to come from the end user.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>   
Acked-by: Ben Warren <biggerbadderben@gmail.com>
> ---
>  include/configs/sbc8560.h |   22 +++++++++++++---------
>  1 files changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
> index f07fbc0..f4408ad 100644
> --- a/include/configs/sbc8560.h
> +++ b/include/configs/sbc8560.h
> @@ -327,9 +327,8 @@
>    #define CFG_ENV_SIZE		0x2000
>  #endif
>  
> -#define CONFIG_BOOTARGS "root=/dev/nfs rw nfsroot=192.168.0.251:/tftpboot ip=192.168.0.105:192.168.0.251::255.255.255.0:sbc8560:eth0:off console=ttyS0,9600"
> +#define CONFIG_BOOTARGS "root=/dev/nfs rw ip=dhcp console=ttyS0,9600"
>  /*#define CONFIG_BOOTARGS      "root=/dev/ram rw console=ttyS0,115200"*/
> -#define CONFIG_BOOTCOMMAND	"bootm 0xff800000 0xffa00000"
>  #define CONFIG_BOOTDELAY	5	/* -1 disable autoboot */
>  
>  #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
> @@ -405,19 +404,24 @@
>    #define CONFIG_KGDB_SER_INDEX	2	/* which serial port to use */
>  #endif
>  
> -/*Note: change below for your network setting!!! */
>  #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
> -#  define CONFIG_ETHADDR	00:01:af:07:9b:8a
> -#  define CONFIG_HAS_ETH1
> -#  define CONFIG_ETH1ADDR	00:01:af:07:9b:8b
> -#  define CONFIG_HAS_ETH2
> -#  define CONFIG_ETH2ADDR	00:01:af:07:9b:8c
> +#define CONFIG_HAS_ETH0
> +#define CONFIG_HAS_ETH1
>  #endif
>  
> +/* You can compile in a MAC address and your custom net settings by using
> + * the * following syntax.  Your board should be marked with the assigned
> + * MAC addresses directly on it.
> + */
> +#if 0
> +#define CONFIG_ETHADDR		00:01:af:07:9b:8a
> +#define CONFIG_ETH1ADDR		00:01:af:07:9b:8b
>  #define CONFIG_SERVERIP		192.168.0.131
>  #define CONFIG_IPADDR		192.168.0.105
> -#define CONFIG_GATEWAYIP	0.0.0.0
> +#define CONFIG_GATEWAYIP	192.168.0.1
>  #define CONFIG_NETMASK		255.255.255.0
> +#endif
> +
>   
That's a good way of doing it.  I know people generally don't like #if 
0, but you're conveying useful information.
>  #define CONFIG_HOSTNAME		SBC8560
>  #define CONFIG_ROOTPATH		/home/ppc
>  #define CONFIG_BOOTFILE		pImage
>   
regards,
Ben