Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / configs / ap325rxa.h

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 462b2e29106fbc7094e98ad76821b8f6b7130bf4..c86ce0577935e47259dff0b748fa95951e64a210 100644 (file)
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -10,28 +10,17 @@
 #ifndef __AP325RXA_H
 #define __AP325RXA_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7723      1
 #define CONFIG_AP325RXA        1
 
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_IDE
-#define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION
 
 #define CONFIG_BAUDRATE                38400
-#define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTARGS                "console=ttySC2,38400"
 
-#define CONFIG_VERSION_VARIABLE
+#define CONFIG_DISPLAY_BOARDINFO
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* SMC9118 */
@@ -66,9 +55,6 @@
 #define CONFIG_CONS_SCIF5      1
 
 /* Suppress display of console information at boot */
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START       (AP325RXA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))