Skip to content
Snippets Groups Projects
Commit 624ce342 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

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

parents 5379cd15 7602ed50
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/configs/mx31ads.h
+ 2
− 4
View file @ 624ce342
...@@ -79,15 +79,13 @@ ...@@ -79,15 +79,13 @@
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_SPI #define CONFIG_CMD_SPI
#define CONFIG_CMD_DATE #define CONFIG_CMD_DATE
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */
#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_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \ "netdev=eth0\0" \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment