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

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

diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index f8155efbc9848cc9ecd5fa13d726517847e10f0a..dde6625f048d28291320331020fd12a39e4b884c 100644 (file)
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -15,14 +15,8 @@
 /* T-SH7706LSR*/
 /* #define CONFIG_T_SH7706LSR  1 */
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTARGS                "console=ttySC0,115200"
@@ -31,8 +25,8 @@
  * This board has original boot loader. If you write u-boot to 0x0,
  * you should set undef.
  */
-#define CONFIG_VERSION_VARIABLE
 #undef  CONFIG_SHOW_BOOT_PROGRESS
+#define CONFIG_DISPLAY_BOARDINFO
 
 /* system */
 #define SHMIN_SDRAM_BASE               (0x8C000000)
@@ -62,7 +56,6 @@
 #define CONFIG_SYS_MONITOR_BASE                (SHMIN_FLASH_BASE_1 + CONFIG_ENV_SECT_SIZE)
 #define CONFIG_SYS_MONITOR_LEN         (128 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
-#define CONFIG_SYS_GBL_DATA_SIZE       256
 #define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
 
 /* FLASH */