Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[platform/kernel/u-boot.git] / include / configs / tb100.h

diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index e3c41ef..39bb5b3 100644 (file)
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -35,8 +35,6 @@
 /*
  * UART configuration
  */
-#define CONFIG_DW_SERIAL
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK         166666666
 #define CONFIG_BAUDRATE                        115200
@@ -44,7 +42,6 @@
 /*
  * Ethernet PHY configuration
  */
-#define CONFIG_PHYLIB
 #define CONFIG_PHY_GIGE
 
 /*
@@ -68,10 +65,6 @@
 /*
  * Command line configuration
  */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-
-#define CONFIG_OF_LIBFDT
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_MAXARGS             16
@@ -86,7 +79,6 @@
 /*
  * Environment configuration
  */
-#define CONFIG_BOOTDELAY               3
 #define CONFIG_BOOTFILE                        "uImage"
 #define CONFIG_BOOTARGS                        "console=ttyS0,115200n8"
 #define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR