Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-coldfire

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

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index bde9e77..f04d9b1 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -19,8 +19,6 @@
 
 #define CFG_SYS_UART_PORT              (0)
 
-#undef CONFIG_MONITOR_IS_IN_RAM        /* define if monitor is started from a pre-loader */
-
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
@@ -29,15 +27,7 @@
        . = DEFINED(env_offset) ? env_offset : .; \
        env/embedded.o(.text*);
 
-#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                         /* CONFIG_MCFFEC */
-
-#define CONFIG_HOSTNAME                "M5282EVB"
-#define CONFIG_EXTRA_ENV_SETTINGS              \
+#define CFG_EXTRA_ENV_SETTINGS         \
        "netdev=eth0\0"                         \
        "loadaddr=10000\0"                      \
        "u-boot=u-boot.bin\0"                   \
@@ -137,4 +127,6 @@
 #define CFG_SYS_DDRUA          0x05
 #define CFG_SYS_PJPAR          0xFF
 
+#define CFG_MCFTMR
+
 #endif                         /* _CONFIG_M5282EVB_H */