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

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

diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index 53128ecc12045717643455dafe4340b100f8b58b..1ac15e27b77eb762ef023a012475cd749781f665 100644 (file)
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -9,30 +9,20 @@
 #ifndef __R0P7734_H
 #define __R0P7734_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7734      1
 #define CONFIG_R0P7734         1
 #define CONFIG_400MHZ_MODE     1
 /* #define CONFIG_533MHZ_MODE  1 */
 
-#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_SYS_TEXT_BASE 0x8FFC0000
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTARGS                "console=ttySC3,115200"
 
-#define CONFIG_VERSION_VARIABLE
+#define CONFIG_DISPLAY_BOARDINFO
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* Ether */
@@ -51,9 +41,7 @@
 # define CONFIG_SMC911X_BASE (0x84000000)
 #endif
 
-
 /* I2C */
-#define CONFIG_CMD_I2C
 #define CONFIG_SH_SH7734_I2C   1
 #define CONFIG_HARD_I2C                        1
 #define CONFIG_I2C_MULTI_BUS   1
@@ -87,9 +75,6 @@
 #define CONFIG_CONS_SCIF3      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
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE  (0x88000000)
@@ -140,8 +125,6 @@
 #define CONFIG_SYS_MONITOR_LEN (256 * 1024)
 /* Size of DRAM reserved for malloc() use */
 #define CONFIG_SYS_MALLOC_LEN  (256 * 1024)
-/* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE       (256)
 #define CONFIG_SYS_BOOTMAPSZ   (8 * 1024 * 1024)
 
 /* ENV setting */