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

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

diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index e06484f861879a9981d98bfd6dd5a8686347d60e..8216d6e54b53f7fdef66774127b51c6a97a07c67 100644 (file)
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -9,11 +9,6 @@
 
 #include <linux/sizes.h>
 
-/*
- *  CPU configuration
- */
-#define CONFIG_SYS_TIMER_RATE          CONFIG_SYS_CLK_FREQ
-
 /*
  * Memory configuration
  */
@@ -30,19 +25,11 @@
 #define CONFIG_SYS_BOOTM_LEN           SZ_32M
 #define CONFIG_SYS_LOAD_ADDR           0x82000000
 
-#define CONFIG_SYS_NO_FLASH
-
 /*
  * UART configuration
  */
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK         166666666
-#define CONFIG_BAUDRATE                        115200
-
-/*
- * Ethernet PHY configuration
- */
-#define CONFIG_PHY_GIGE
 
 /*
  * Even though the board houses Realtek RTL8211E PHY
@@ -65,36 +52,21 @@
 /*
  * Command line configuration
  */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-
-#define CONFIG_OF_LIBFDT
-
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS             16
 
 /*
  * Environment settings
  */
-#define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE                        SZ_2K
 #define CONFIG_ENV_OFFSET              0
 
 /*
  * Environment configuration
  */
-#define CONFIG_BOOTDELAY               3
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_BOOTARGS                        "console=ttyS0,115200n8"
 #define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 /*
  * Console configuration
  */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                               sizeof(CONFIG_SYS_PROMPT) + 16)
 
 #endif /* _CONFIG_TB100_H_ */