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

[people/ms/u-boot.git] / include / configs / som-db5800-som-6867.h

diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h
index a4b343eae9be5dc83715637abec5a6252eb763ac..17adf7e40df2a31b7033fd782a3a808cf808186f 100644 (file)
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -14,14 +14,10 @@
 #include <configs/x86-common.h>
 
 #define CONFIG_SYS_MONITOR_LEN         (1 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_ARCH_EARLY_INIT_R
-#define CONFIG_ARCH_MISC_INIT
-
-#define CONFIG_PCI_PNP
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial,usbkbd,vga\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}, \