Move CONFIG_OF_LIBFDT to Kconfig

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

diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 53cf498dbe410b5af44427e5ddeb7c6eaf1992aa..e5a50dfed5fd9472300db6c72c21f22772315759 100644 (file)
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -18,12 +18,12 @@
  */
 
 #define CONFIG_405GP           1       /* This is a PPC405 CPU         */
-#define CONFIG_4xx             1       /* ...member of PPC4xx family   */
 #define CONFIG_CPCI405         1       /* ...on a CPCI405 board        */
 #define CONFIG_CPCI405_VER2    1       /* ...version 2                 */
 #undef  CONFIG_CPCI405_6U               /* enable this for 6U boards    */
 
 #define        CONFIG_SYS_TEXT_BASE    0xFFFC0000
+#define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* call board_early_init_f()    */
 #define CONFIG_MISC_INIT_R      1      /* call misc_init_r()           */
@@ -66,14 +66,11 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
@@ -93,7 +90,7 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_LONGHELP                    /* undef to save memory         */
+#undef CONFIG_SYS_LONGHELP                     /* undef to save memory         */
 
 #undef CONFIG_SYS_HUSH_PARSER                  /* use "hush" command parser    */
 
@@ -116,7 +113,6 @@
 #define CONFIG_SYS_MEMTEST_END         0x0C00000       /* 4 ... 12 MB in DRAM  */
 
 #define CONFIG_CONS_INDEX      1       /* Use UART0                    */
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         get_serial_clock()
@@ -140,12 +136,6 @@
 
 #define CONFIG_VERSION_VARIABLE 1      /* include version env variable */
 
-#define CONFIG_AUTOBOOT_KEYED  1
-#define CONFIG_AUTOBOOT_PROMPT \
-       "Press SPACE to abort autoboot in %d seconds\n", bootdelay
-#undef CONFIG_AUTOBOOT_DELAY_STR
-#define CONFIG_AUTOBOOT_STOP_STR " "
-
 #define CONFIG_SYS_RX_ETH_BUFFER       16      /* use 16 rx buffer on 405 emac */
 
 /*-----------------------------------------------------------------------
@@ -219,7 +209,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 
-#define CONFIG_OF_LIBFDT
 #define CONFIG_OF_BOARD_SETUP
 
 /*-----------------------------------------------------------------------