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

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

diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h
index d37a865d1dd02ddf0e52233e2f39a41fcfb424ab..60c513982ed24a749f5e7c4305c23d76a50a5175 100644 (file)
--- a/include/configs/bayleybay.h
+++ b/include/configs/bayleybay.h
@@ -14,28 +14,16 @@
 #include <configs/x86-common.h>
 
 #define CONFIG_SYS_MONITOR_LEN         (1 << 20)
-#define CONFIG_ARCH_MISC_INIT
 
-#define CONFIG_PCI_CONFIG_HOST_BRIDGE
-#define CONFIG_SYS_EARLY_PCI_INIT
-#define CONFIG_PCI_PNP
-
-#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,vga,usbkbd\0" \
-                                       "stdout=serial,vga\0" \
-                                       "stderr=serial,vga\0"
+#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,usbkbd\0" \
+                                       "stdout=serial,vidconsole\0" \
+                                       "stderr=serial,vidconsole\0"
 
 #define CONFIG_SCSI_DEV_LIST           \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
-#define CONFIG_MMC
-#define CONFIG_SDHCI
 #define CONFIG_GENERIC_MMC
-#define CONFIG_MMC_SDMA
-#define CONFIG_CMD_MMC
-
-/* BayTrail IGD support */
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 
 /* Environment configuration */
 #define CONFIG_ENV_SECT_SIZE           0x1000