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

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

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 60f82912af18e66dbf8e2f107d58d80fa1ce2db4..624cef712df9f5626e9e087e74121cfb9e5d224b 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -208,7 +208,6 @@
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
 #define CONFIG_AUTO_COMPLETE   1       /* add autocompletion support */
 
-
 /*
  * I2C
  */
@@ -257,7 +256,6 @@
 #undef CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup  */
 #endif /* CONFIG_PCI */
 
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_TSEC1   1
 #define CONFIG_TSEC1_NAME      "TSEC0"
@@ -295,7 +293,6 @@
 
 #define        CONFIG_TIMESTAMP                /* Print image info with ts     */
 
-
 /*
  * BOOTP options
  */
@@ -304,22 +301,14 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */
 #define CONFIG_CMD_BMP
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DTT
 #undef CONFIG_CMD_EEPROM
-#define CONFIG_CMD_EXT2                /* EXT2 Support                 */
-#define CONFIG_CMD_I2C
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_SNTP
-#define CONFIG_CMD_USB
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
@@ -355,10 +344,8 @@
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port*/
 #endif
 
-
 #define CONFIG_LOADADDR         200000         /* default addr for tftp & bootm*/
 
-#define CONFIG_BOOTDELAY 1             /* -1 disables auto-boot        */
 
 #define CONFIG_PREBOOT "echo;" \
        "echo Welcome on the ABB Socrates Board;" \