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

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

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index c654a0e..29f9522 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -17,16 +17,12 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/* new uImage format support */
-#define CONFIG_FIT             1
-#define CONFIG_OF_LIBFDT       1
-#define CONFIG_FIT_VERBOSE     1 /* enable fit_format_{error,warning}() */
-
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE                        */
 #define CONFIG_E500            1       /* BOOKE e500 family            */
 #define CONFIG_MPC8544         1
 #define CONFIG_SOCRATES                1
+#define CONFIG_DISPLAY_BOARDINFO
 
 #define        CONFIG_SYS_TEXT_BASE    0xfff80000
 
@@ -197,7 +193,6 @@
 /* Serial Port */
 
 #define CONFIG_CONS_INDEX     1
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         get_bus_freq(0)
@@ -212,8 +207,6 @@
 
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
 #define CONFIG_AUTO_COMPLETE   1       /* add autocompletion support */
-#define CONFIG_SYS_HUSH_PARSER         1       /* Use the HUSH parser          */
-
 
 /*
  * I2C
@@ -263,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"
@@ -301,7 +293,6 @@
 
 #define        CONFIG_TIMESTAMP                /* Print image info with ts     */
 
-
 /*
  * BOOTP options
  */
@@ -310,25 +301,14 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #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
-#undef CONFIG_CMD_NFS
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_SNTP
-#define CONFIG_CMD_USB
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
@@ -364,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;" \
@@ -432,8 +410,6 @@
 #define CONFIG_BOOTCOMMAND     "run boot_nor"
 
 /* pass open firmware flat tree */
-#define CONFIG_OF_LIBFDT       1
-#define CONFIG_OF_BOARD_SETUP  1
 
 /* USB support */
 #define CONFIG_USB_OHCI_NEW            1
@@ -444,6 +420,5 @@
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME          "ohci_pci"
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS        1
 #define CONFIG_DOS_PARTITION           1
-#define CONFIG_USB_STORAGE             1
 
 #endif /* __CONFIG_H */