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

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

diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index ccebc30e16932fc7d4b15d6d66f8afc26837c442..2c31d99a62bb731ddceef507a916a0f6ebe180bb 100644 (file)
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -19,11 +19,8 @@
  * (easy to change)
  */
 
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
-#define CONFIG_BAUDRATE                115200
 
 #undef CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT        5000    /* timeout in milliseconds, max timeout is 6.71sec */
@@ -72,13 +69,11 @@
 
 #ifdef CONFIG_CMD_USB
 #      define CONFIG_USB_OHCI_NEW
-#      define CONFIG_USB_STORAGE
 
 #      ifndef CONFIG_CMD_PCI
 #              define CONFIG_CMD_PCI
 #      endif
 #      define CONFIG_PCI_OHCI
-#      define CONFIG_DOS_PARTITION
 
 #      undef CONFIG_SYS_USB_OHCI_BOARD_INIT
 #      undef CONFIG_SYS_USB_OHCI_CPU_INIT
@@ -97,8 +92,6 @@
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI             1
-#define CONFIG_PCI_PNP         1
 #define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE        1
 
 #define CONFIG_SYS_PCI_CACHE_LINE_SIZE 8