Merge with /home/sr/git/u-boot/cfi-flash

[oweals/u-boot.git] / include / configs / mx1ads.h

diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index df951e2d745efd8fe8ac97b97cf7fe07a72dd9fc..7f3dfd5c987833b2ed533a11abf46846576d3231 100644 (file)
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -28,12 +28,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL           /* undef for developing */
-
 /*
  * High Level Configuration Options
  * (easy to change)
@@ -99,10 +93,6 @@
 
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTARGS                "root=/dev/msdk mem=48M"
-#define CONFIG_ETHADDR         08:00:3e:26:0a:5c
-#define CONFIG_NETMASK         255.255.255.0
-#define CONFIG_IPADDR          192.168.0.22
-#define CONFIG_SERVERIP                192.168.0.11
 #define CONFIG_BOOTFILE                "mx1ads"
 #define CONFIG_BOOTCOMMAND     "tftp; bootm"