summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-28 11:34:34 +0200
committerWolfgang Denk <wd@denx.de>2008-04-28 11:34:34 +0200
commit624ce3428a75ce3e85be8b23020cb4ad26b05475 (patch)
tree9d4138faffde0945e325b65335b03588823cb691
parent5379cd15dd6c74ac51499bce3455bf6e0cdbe9f1 (diff)
parent7602ed50a2f0ef3dc8d7da93f116de50288f5b59 (diff)
downloadu-boot-imx-624ce3428a75ce3e85be8b23020cb4ad26b05475.zip
u-boot-imx-624ce3428a75ce3e85be8b23020cb4ad26b05475.tar.gz
u-boot-imx-624ce3428a75ce3e85be8b23020cb4ad26b05475.tar.bz2
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
-rw-r--r--include/configs/mx31ads.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 5286e1f..7614b95 100644
--- 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" \