From e9d7562f386998944af6e7609bc7361386e05494 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sun, 20 Mar 2016 17:35:07 -0400
Subject: Revert "T60 headless config"

This reverts commit d0ea6701083f30fe87a401da04b8804fef39f5a3.
---
(limited to 'resources/libreboot')

diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config
index dd9c3b0..ee5cb7d 100644
--- a/resources/libreboot/config/grub/t60/config
+++ b/resources/libreboot/config/grub/t60/config
@@ -123,7 +123,7 @@ CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
-# CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
@@ -360,10 +360,7 @@ CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-# CONFIG_VGA_ROM_RUN is not set
-# CONFIG_ON_DEVICE_ROM_LOAD is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
+CONFIG_ON_DEVICE_ROM_LOAD=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
@@ -384,10 +381,14 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_SOFTWARE_I2C is not set
 
 #
+# Display
+#
+# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
+
+#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
-CONFIG_DEVICE_SPECIFIC_OPTIONS=y
 # CONFIG_GIC is not set
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
--
cgit v0.9.1