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

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

diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index 897ba1d408550f95636a85528738bc02ac6ce850..3755eba167d63e5040980c434e0985cdab5c2ee6 100644 (file)
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -15,18 +15,12 @@
 /* T-SH7706LSR*/
 /* #define CONFIG_T_SH7706LSR  1 */
 
-#define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_ENV
-
-#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)
@@ -43,7 +37,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600,14400,19200,38400,57600,115200 }
 
 /* SCIF */
-#define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF0      1
 
 /* memory */
@@ -74,7 +67,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