Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

624ce342 · Wolfgang Denk · 5379cd15 · 7602ed50 · 624ce342
隐藏空白更改
内联并排

Showing with 2 addition and 4 deletion

include/configs/mx31ads.h include/configs/mx31ads.h +2 -4

未找到文件。
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -79,15 +79,13 @@
 #include <config_cmd_default.h>

 #define CONFIG_CMD_PING
+#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_DATE

 #define CONFIG_BOOTDELAY	3

-#define CONFIG_NETMASK		255.255.255.0
-#define CONFIG_IPADDR		192.168.23.168
-#define CONFIG_SERVERIP		192.168.23.2
-#define CONFIG_LOADADDR		(CSD0_BASE + 0x800000)	/* loadaddr env var */
+#define CONFIG_LOADADDR		0x80800000	/* loadaddr env var */

 #define	CONFIG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\