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

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

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 8a94c28..f308460 100644 (file)
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -25,7 +25,6 @@
 #ifndef __MS7720SE_H
 #define __MS7720SE_H
 
-#undef DEBUG
 #define CONFIG_SH              1
 #define CONFIG_SH3             1
 #define CONFIG_CPU_SH7720      1
@@ -40,13 +39,6 @@
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_EXT2
 
-#define CFG_CMD_PCMCIA 0x01
-#define CFG_CMD_IDE    0x02
-
-#define CONFIG_COMMANDS                ((CONFIG_CMD_DFL        | \
-                                CFG_CMD_IDE|CFG_CMD_PCMCIA)    & \
-                               ~(CFG_CMD_FPGA))
-
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTARGS                "console=ttySC0,115200"
 #define CONFIG_BOOTFILE                /boot/zImage
@@ -71,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
@@ -90,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 */
 
@@ -100,11 +92,11 @@
 #define CFG_MAX_FLASH_BANKS    1
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 
-#define CFG_ENV_IS_IN_FLASH
-#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 CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_SECT_SIZE   (64 * 1024)
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define CFG_FLASH_ERASE_TOUT   120000
 #define CFG_FLASH_WRITE_TOUT   500
 
 /* Board Clock */