Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 723103fb21f6e87c69922df9affd4494821bfec2..61d6fd080ddb2a7a216825344139aa59af4f97f9 100644 (file)
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -157,10 +157,8 @@
 #define PCI_HOST_FORCE  1               /* configure as pci host        */
 #define PCI_HOST_AUTO   2               /* detected via arbiter enable  */
 
-#define CONFIG_PCI                     /* include pci support          */
 #define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
 #define CONFIG_PCI_HOST PCI_HOST_FORCE /* configure as pci-host        */
-#define CONFIG_PCI_PNP                 /* pci plug-and-play            */
                                        /* resource configuration       */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x0000  /* PCI Vendor ID: to-do!!!      */
 #define CONFIG_SYS_PCI_SUBSYS_DEVICEID 0x0000  /* PCI Device ID: to-do!!!      */
@@ -248,7 +246,6 @@
 /* Size: 0=1MB, 1=2MB, 2=4MB, 3=8MB, 4=16MB, 5=32MB, 6=64MB, 7=128MB */
 #define FLASH_SIZE_PRELIM       3  /* maximal flash FLASH size bank #0 */
 
-#define CONFIG_BOARD_EARLY_INIT_F 1
 #define CONFIG_BOARD_EARLY_INIT_R
 
 /* Peripheral Bus Mapping */
@@ -343,10 +340,8 @@
  ************************************************************/
 #if !defined(CONFIG_TARGET_MIP405T)
 #define CONFIG_USB_UHCI
-#define CONFIG_USB_KEYBOARD
 
 /* Enable needed helper functions */
-#define CONFIG_SYS_STDIO_DEREGISTER            /* needs stdio_deregister */
 #endif
 /************************************************************
  * Debug support