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 3a9b8f3..9babe6a 100644 (file)
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -53,7 +53,6 @@ Serial console configuration
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
@@ -68,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;" \
@@ -413,7 +405,6 @@ RTC configuration
 
 /* USB */
 #define CONFIG_USB_OHCI
-#define CONFIG_USB_STORAGE
 
 /* pass open firmware flat tree */
 #define OF_CPU                         "PowerPC,5200@0"