Move setting CONFIG_BOOTP_VCI_STRING to before including the vexpress-common header

[karo-tx-uboot.git] / include / configs / socrates.h

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 0e6b86412d125597cab3617b86cc22b7b87a21b7..627119b6744b25ee04af2df2d035639d90f1b6c5 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -25,9 +25,7 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE                        */
 #define CONFIG_E500            1       /* BOOKE e500 family            */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41             */
 #define CONFIG_MPC8544         1
-#define CONFIG_SOCRATES                1
 
 #define        CONFIG_SYS_TEXT_BASE    0xfff80000
 
@@ -315,8 +313,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BMP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -326,7 +322,6 @@
 #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
@@ -363,7 +358,6 @@
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port*/
-#define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use     */
 #endif