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

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

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 8301c46..0eed59e 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -20,8 +20,6 @@
  */
 #define CONFIG_M54455EVB       /* M54455EVB board */
 
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
 #define CONFIG_BAUDRATE                115200
@@ -121,8 +119,6 @@
 #endif
 
 /* ATA configuration */
-#define CONFIG_ISO_PARTITION
-#define CONFIG_DOS_PARTITION
 #define CONFIG_IDE_RESET       1
 #define CONFIG_IDE_PREINIT     1
 #define CONFIG_ATAPI
@@ -174,8 +170,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 4