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

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

diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index 88845dc0681f10130bbbdb8da6acd3f214acaaee..5f4800bdac20da73ffaf3127ac465e3233559568 100644 (file)
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -10,12 +10,9 @@
 #include <configs/x86-common.h>
 
 #define CONFIG_SYS_MONITOR_LEN         (2 << 20)
-#define CONFIG_BOARD_EARLY_INIT_F
 
 #define CONFIG_SMSC_SIO1007
 
-#define CONFIG_PCI_PNP
-
 #define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,i8042-kbd,usbkbd\0" \
                                        "stdout=serial,vga\0" \
                                        "stderr=serial,vga\0"
@@ -27,8 +24,4 @@
 #define CONFIG_ENV_SECT_SIZE           0x1000
 #define CONFIG_ENV_OFFSET              0x5ff000
 
-/* Video is not supported for now */
-#undef CONFIG_VIDEO
-#undef CONFIG_CFB_CONSOLE
-
 #endif /* __CONFIG_H */