Merge branch 'master' of git://git.denx.de/u-boot-coldfire

[platform/kernel/u-boot.git] / include / configs / M5329EVB.h

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 72f0c63..dd5d4c9 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -22,15 +22,7 @@
 
 /* I2C */
 
-#ifdef CONFIG_MCFFEC
-#      define CONFIG_IPADDR    192.162.1.2
-#      define CONFIG_NETMASK   255.255.255.0
-#      define CONFIG_SERVERIP  192.162.1.1
-#      define CONFIG_GATEWAYIP 192.162.1.1
-#endif                         /* FEC_ENET */
-
-#define CONFIG_HOSTNAME                "M5329EVB"
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+#define CFG_EXTRA_ENV_SETTINGS                                 \
        "netdev=eth0\0"                 \
        "loadaddr=40010000\0"   \
        "u-boot=u-boot.bin\0"   \
@@ -42,7 +34,7 @@
        "save\0"        \
        ""
 
-#define CONFIG_PRAM            512     /* 512 KB */
+#define CFG_PRAM               512     /* 512 KB */
 
 #define CFG_SYS_CLK                    80000000
 #define CFG_SYS_CPU_CLK                CFG_SYS_CLK * 3
@@ -146,4 +138,5 @@
 #define CFG_SYS_CS2_CTRL               0x00001f60
 #endif
 
+
 #endif                         /* _M5329EVB_H */