Merge branch 'master' of /home/wd/git/u-boot/custodians

[platform/kernel/u-boot.git] / include / configs / EB+MCF-EV123.h

diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 417099e..a949454 100644 (file)
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -51,18 +51,18 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
-#define CFG_ENV_ADDR           0xF003C000      /* End of 256K */
-#define CFG_ENV_SECT_SIZE      0x4000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_ADDR                0xF003C000      /* End of 256K */
+#define CONFIG_ENV_SECT_SIZE   0x4000
+#define CONFIG_ENV_IS_IN_FLASH 1
 /*
-#define CFG_ENV_IS_EMBEDDED    1
-#define CFG_ENV_ADDR_REDUND            0xF0018000
-#define CFG_ENV_SECT_SIZE_REDUND       0x4000
+#define CONFIG_ENV_IS_EMBEDDED 1
+#define CONFIG_ENV_ADDR_REDUND         0xF0018000
+#define CONFIG_ENV_SECT_SIZE_REDUND    0x4000
 */
 #else
-#define CFG_ENV_ADDR           0xFFE04000
-#define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_ADDR                0xFFE04000
+#define CONFIG_ENV_SECT_SIZE   0x2000
+#define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 
@@ -84,6 +84,8 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NET
 
+#define CONFIG_MCFTMR
+
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
 #      define CONFIG_NET_MULTI         1