Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 67b5774..a395e67 100644 (file)
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -32,11 +32,6 @@
 #define CONFIG_SYS_NS16550_CLK         166666666
 
 /*
- * Ethernet PHY configuration
- */
-#define CONFIG_PHY_GIGE
-
-/*
  * Even though the board houses Realtek RTL8211E PHY
  * corresponding PHY driver (drivers/net/phy/realtek.c) behaves unexpectedly.
  * In particular "parse_status" reports link is down.
@@ -59,7 +54,6 @@
  */
 
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS             16
 #define CONFIG_CMDLINE_EDITING
 
 /*
@@ -72,16 +66,11 @@
  * Environment configuration
  */
 #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_ */