Merge branch 'Makefile' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 9c94c4e..1c3d277 100644 (file)
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -63,7 +63,7 @@
 #define CFG_BAUDRATE_TABLE     { 115200 }
 
 /* SCIF */
-#define CFG_SCIF_CONSOLE       1
+#define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF0      1
 
 #define CFG_MEMTEST_START      MS7720SE_SDRAM_BASE
@@ -82,7 +82,7 @@
 
 /* FLASH */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #undef  CFG_FLASH_QUIET_TEST
 #define CFG_FLASH_EMPTY_INFO   /* print 'E' for empty sector on flinfo */
 
@@ -96,7 +96,7 @@
 #define CFG_ENV_SECT_SIZE      (64 * 1024)
 #define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#define CFG_FLASH_ERASE_TOUT   120000
+#define CFG_FLASH_ERASE_TOUT   120000
 #define CFG_FLASH_WRITE_TOUT   500
 
 /* Board Clock */