Move CONFIG_OF_LIBFDT to Kconfig

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

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index c654a0e4ebc01bbb4f486e0c1cf977eb6342efff..5956e111cc71b51cd4ba9b099c8c9394e2d0e6cc 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -19,7 +19,6 @@
 
 /* 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 */
@@ -27,6 +26,7 @@
 #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 +197,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)
@@ -314,8 +313,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BMP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -325,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
@@ -432,7 +428,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 */