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

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

diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index b4a7225..47ded81 100644 (file)
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -51,11 +51,8 @@ Serial console configuration
  * Command line configuration.
  */
 #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_PCI
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
@@ -70,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;" \
@@ -123,8 +113,6 @@ IPB Bus clocking configuration.
  * 0x40000000 - 0x4fffffff - PCI Memory
  * 0x50000000 - 0x50ffffff - PCI IO Space
  * -----------------------------------------------------------------------*/
-#define CONFIG_PCI                     1
-#define CONFIG_PCI_PNP                 1
 #define CONFIG_PCI_SCAN_SHOW           1
 #define CONFIG_PCI_MEM_BUS             0x40000000
 #define CONFIG_PCI_MEM_PHYS            CONFIG_PCI_MEM_BUS
@@ -360,8 +348,6 @@ RTC configuration
 
 #define CONFIG_SYS_LOAD_ADDR 0x400000 /* default load address */
 
-#define CONFIG_DISPLAY_BOARDINFO 1
-
 /*-----------------------------------------------------------------------------
  Various low-level settings
 -----------------------------------------------------------------------------*/
@@ -410,12 +396,8 @@ RTC configuration
 #define CONFIG_SYS_ATA_STRIDE          4
 #define CONFIG_ATAPI                   1
 
-/* we enable IDE and FAT support, so we also need partition support */
-#define CONFIG_DOS_PARTITION 1
-
 /* USB */
 #define CONFIG_USB_OHCI
-#define CONFIG_USB_STORAGE
 
 /* pass open firmware flat tree */
 #define OF_CPU                         "PowerPC,5200@0"