sbc8560: define eth0 and eth1 instead of eth1 and eth2
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> Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
		
							parent
							
								
									0ec436d2f9
								
							
						
					
					
						commit
						c158bcaca3
					
				| 
						 | 
					@ -327,9 +327,8 @@
 | 
				
			||||||
  #define CFG_ENV_SIZE		0x2000
 | 
					  #define CFG_ENV_SIZE		0x2000
 | 
				
			||||||
#endif
 | 
					#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_BOOTARGS      "root=/dev/ram rw console=ttyS0,115200"*/
 | 
				
			||||||
#define CONFIG_BOOTCOMMAND	"bootm 0xff800000 0xffa00000"
 | 
					 | 
				
			||||||
#define CONFIG_BOOTDELAY	5	/* -1 disable autoboot */
 | 
					#define CONFIG_BOOTDELAY	5	/* -1 disable autoboot */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
 | 
					#define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
 | 
				
			||||||
| 
						 | 
					@ -405,19 +404,23 @@
 | 
				
			||||||
  #define CONFIG_KGDB_SER_INDEX	2	/* which serial port to use */
 | 
					  #define CONFIG_KGDB_SER_INDEX	2	/* which serial port to use */
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*Note: change below for your network setting!!! */
 | 
					 | 
				
			||||||
#if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
 | 
					#if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
 | 
				
			||||||
#  define CONFIG_ETHADDR	00:01:af:07:9b:8a
 | 
					#define CONFIG_HAS_ETH0
 | 
				
			||||||
#  define CONFIG_HAS_ETH1
 | 
					#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
 | 
					 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_SERVERIP		192.168.0.131
 | 
					/* You can compile in a MAC address and your custom net settings by using
 | 
				
			||||||
#define CONFIG_IPADDR		192.168.0.105
 | 
					 * the following syntax.  Your board should be marked with the assigned
 | 
				
			||||||
#define CONFIG_GATEWAYIP	0.0.0.0
 | 
					 * MAC addresses directly on it.
 | 
				
			||||||
#define CONFIG_NETMASK		255.255.255.0
 | 
					 *
 | 
				
			||||||
 | 
					 * #define CONFIG_ETHADDR		de:ad:be:ef:00:00
 | 
				
			||||||
 | 
					 * #define CONFIG_ETH1ADDR		fa:ke:ad:dr:es:s!
 | 
				
			||||||
 | 
					 * #define CONFIG_SERVERIP		<server ip>
 | 
				
			||||||
 | 
					 * #define CONFIG_IPADDR		<board ip>
 | 
				
			||||||
 | 
					 * #define CONFIG_GATEWAYIP		<gateway ip>
 | 
				
			||||||
 | 
					 * #define CONFIG_NETMASK		<your netmask>
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_HOSTNAME		SBC8560
 | 
					#define CONFIG_HOSTNAME		SBC8560
 | 
				
			||||||
#define CONFIG_ROOTPATH		/home/ppc
 | 
					#define CONFIG_ROOTPATH		/home/ppc
 | 
				
			||||||
#define CONFIG_BOOTFILE		pImage
 | 
					#define CONFIG_BOOTFILE		pImage
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue