summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-05-08 19:58:26 +0100
committerLeah Rowe <leah@libreboot.org>2023-05-08 19:58:26 +0100
commita9f81e44563e97e71a29c17cd6b9eae68cb8ca3e (patch)
tree490f2bef7893c46bb152d3920473476d9ad12be2
parent499fa42125e5722208f3afec80dbf27120263947 (diff)
Revert "Revert "coreboot/e6400nvidia: don't run vga rom""
This reverts commit 4ee5e2af36ae8cbce9c6ee0efe5cba11c2793098. I thought maybe coreboot init would work better, but i get the same problem: xorg doesn't start at all, when using the nouveau driver. However, booting to tty works fine, and you can run xorg with the nomodeset option (in Linux) at startup.
-rw-r--r--resources/coreboot/e6400nvidia_4mb/config/vgarom_txtmode19
1 files changed, 2 insertions, 17 deletions
diff --git a/resources/coreboot/e6400nvidia_4mb/config/vgarom_txtmode b/resources/coreboot/e6400nvidia_4mb/config/vgarom_txtmode
index a75fa60..de3d2bd 100644
--- a/resources/coreboot/e6400nvidia_4mb/config/vgarom_txtmode
+++ b/resources/coreboot/e6400nvidia_4mb/config/vgarom_txtmode
@@ -154,7 +154,6 @@ CONFIG_PS2M_EISAID="PNP0F13"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
-CONFIG_PRE_GRAPHICS_DELAY_MS=0
CONFIG_HEAP_SIZE=0x4000
CONFIG_EC_GPE_SCI=0x50
CONFIG_BOARD_ROMSIZE_KB_4096=y
@@ -197,7 +196,6 @@ CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
# CONFIG_VGA_BIOS_SECOND is not set
-CONFIG_S3_VGA_ROM_RUN=y
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02X"
CONFIG_EHCI_BAR=0xfef00000
CONFIG_STACK_SIZE=0x2000
@@ -323,24 +321,12 @@ CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y
#
# Devices
#
-CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_VGA_ROM_RUN_DEFAULT=y
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
# CONFIG_MAINBOARD_USE_LIBGFXINIT is not set
-CONFIG_VGA_ROM_RUN=y
-# CONFIG_NO_GFX_INIT is not set
+# CONFIG_VGA_ROM_RUN is not set
+CONFIG_NO_GFX_INIT=y
CONFIG_NO_EARLY_GFX_INIT=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
-CONFIG_PCI_OPTION_ROM_RUN_REALMODE=y
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
-
-#
-# Display
-#
-# CONFIG_FRAMEBUFFER_SET_VESA_MODE is not set
-CONFIG_VGA_TEXT_FRAMEBUFFER=y
-# end of Display
-
CONFIG_PCI=y
CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
@@ -538,7 +524,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_MALLOC is not set
# CONFIG_DEBUG_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
-# CONFIG_REALMODE_DEBUG is not set
# CONFIG_DEBUG_SPI_FLASH is not set
# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set