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

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

diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index 5c990fc96d03a03ace322d9cc4a45c1c0aeca863..cd79674bff205d1ecfa3ac4c0c7945886713a7d7 100644 (file)
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -9,49 +9,29 @@
 #ifndef __SHMIN_H
 #define __SHMIN_H
 
-#define CONFIG_SH              1
-#define CONFIG_SH3             1
 #define CONFIG_CPU_SH7706      1
 /* T-SH7706LAN */
 #define CONFIG_SHMIN           1
 /* 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"
-
 /*
  * 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)
 #define SHMIN_FLASH_BASE_1             (0xA0000000)
 
-#define CONFIG_SYS_TEXT_BASE   0x8DFB0000
 #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 */
-/* Buffer size for Boot Arguments passed to kernel */
-#define CONFIG_SYS_BARGSIZE    512
 /* List of legal baudrate settings for this board */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600,14400,19200,38400,57600,115200 }
 
 /* SCIF */
-#define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF0      1
 
 /* memory */
@@ -64,7 +44,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 */
@@ -83,7 +62,6 @@
 #define CONFIG_SYS_ATMEL_SECT          {1, 2, 1, 7}
 #define CONFIG_SYS_ATMEL_SECTSZ                {0x4000, 0x2000, 0x8000, 0x10000}
 
-#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE   (64 * 1024)
 #define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE