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

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

diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 31a93c8..9babe6a 100644 (file)
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -50,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 */
@@ -73,15 +67,8 @@ Serial console configuration
 #define MTDPARTS_DEFAULT       "mtdparts=physmap-flash.0:256k(ubootl)," \
        "1792k(kernel),13312k(jffs2),256k(uboot)ro,256k(oftree),-(space)"
 
-/*-----------------------------------------------------------------------------
-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;" \
@@ -340,7 +327,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 */
 
@@ -419,12 +405,8 @@ RTC configuration
 
 /* USB */
 #define CONFIG_USB_OHCI
-#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"