common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig option

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

diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 423e2fa6db3ef8b8044efeeaec7607156c056b16..80d5d6c858eb99c98d42dc1003b0714719dcff26 100644 (file)
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -20,8 +20,7 @@
 High Level Configuration Options
 (easy to change)
 -----------------------------------------------------------------------------*/
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_MPC5200_DDR     1       /* (with DDR-SDRAM) */
 #define CONFIG_PHYCORE_MPC5200B_TINY 1 /* phyCORE-MPC5200B -> */
                                        /* FEC configuration and IDE */
@@ -51,15 +50,9 @@ Serial console configuration
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PCI
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
@@ -77,12 +70,10 @@ Serial console configuration
 /*-----------------------------------------------------------------------------
 Autobooting
 -----------------------------------------------------------------------------*/
-#define CONFIG_BOOTDELAY       3       /* autoboot after 3 seconds */
 #define CONFIG_ZERO_BOOTDELAY_CHECK    /* allow stopping of boot process */
                                        /* even with bootdelay=0 */
 #undef CONFIG_BOOTARGS
 
-
 #define CONFIG_PREBOOT "echo;" \
        "echo Type \"run bootcmd_net\" to load Kernel over TFTP and to "\
                "mount root filesystem over NFS;" \
@@ -341,7 +332,6 @@ RTC configuration
  Miscellaneous configurable options
 -------------------------------------------------------------------------------*/
 #define CONFIG_SYS_LONGHELP    /* undef to save memory */
-#define CONFIG_SYS_PROMPT "uboot> " /* Monitor Command Prompt */
 
 #define CONFIG_CMDLINE_EDITING 1 /* add command line history */
 
@@ -364,7 +354,6 @@ RTC configuration
 #define CONFIG_SYS_MEMTEST_END 0x00f00000 /* 1 ... 15 MB in DRAM */
 
 #define CONFIG_SYS_LOAD_ADDR 0x400000 /* default load address */
-#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */
 
 #define CONFIG_DISPLAY_BOARDINFO 1
 
@@ -424,9 +413,6 @@ RTC configuration
 #define CONFIG_USB_STORAGE
 
 /* pass open firmware flat tree */
-#define CONFIG_OF_LIBFDT               1
-#define CONFIG_OF_BOARD_SETUP          1
-
 #define OF_CPU                         "PowerPC,5200@0"
 #define OF_TBCLK                       CONFIG_SYS_MPC5XXX_CLKIN
 #define OF_SOC                         "soc5200@f0000000"