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

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

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 8a94c28237bac800fd8794458e3b3962d4b0cd8b..5e79a271115fd706787d29212d881f63de5c57df 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
@@ -104,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 */