Merge git://git.denx.de/u-boot-mmc

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

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 8ae497c6d56edb5d350ed7ded3ef56c2ad185ba6..f1600b2a3bda2d1c5d92ccc41de8e7f32acf9d5c 100644 (file)
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -11,36 +11,23 @@
 #define __MPR2_H
 
 /* Supported commands */
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_FLASH
 
 /* Default environment variables */
-#define CONFIG_BAUDRATE                115200
-#define CONFIG_BOOTARGS                "console=ttySC0,115200"
 #define CONFIG_BOOTFILE                "/boot/zImage"
 #define CONFIG_LOADADDR                0x8E000000
-#define CONFIG_VERSION_VARIABLE
 
 /* CPU and platform */
 #define CONFIG_CPU_SH7720      1
-#define CONFIG_MPR2            1
+
+#define CONFIG_DISPLAY_BOARDINFO
 
 /* U-Boot internals */
-#define CONFIG_SYS_LONGHELP                    /* undef to save memory */
-#define CONFIG_SYS_CBSIZE              256     /* Buffer size for input from the Console */
-#define CONFIG_SYS_PBSIZE              256     /* Buffer size for Console output */
-#define CONFIG_SYS_MAXARGS             16      /* max args accepted for monitor commands */
-#define CONFIG_SYS_BARGSIZE            512     /* Buffer size for Boot Arguments passed to kernel */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200 }      /* List of legal baudrate settings for this board */
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024)
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
 #define CONFIG_SYS_MONITOR_LEN         (128 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
 
-#define CONFIG_SYS_TEXT_BASE   0x8FFC0000
-
 /* Memory */
 #define CONFIG_SYS_SDRAM_BASE          0x8C000000
 #define CONFIG_SYS_SDRAM_SIZE          (64 * 1024 * 1024)
@@ -55,7 +42,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
-#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE   (128 * 1024)
 #define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
@@ -69,7 +55,6 @@
 #define CONFIG_SYS_TMU_CLK_DIV         4       /* 4 (default), 16, 64, 256 or 1024 */
 
 /* UART */
-#define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF0      1
 
 #endif /* __MPR2_H */