From 93dcfba798e960ac55f59f29b1e2a6595b6a91a0 Mon Sep 17 00:00:00 2001
From: Matthew Drobnak <matthew@drobnak.com>
Date: Sat, 25 May 2024 15:07:42 +0000
Subject: [PATCH] MSI Z790P DDR4 Add dGPU Configuration. Currently uses VGA
 Text during boot.

Signed-off-by: Matthew Drobnak <matthew@drobnak.com>
---
 .../msi_z790p_ddr4_dgpu.config                |  8 +++---
 config/coreboot-msi_z790p_ddr4_dgpu.config    | 25 +++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/boards/msi_z790p_ddr4_dgpu/msi_z790p_ddr4_dgpu.config b/boards/msi_z790p_ddr4_dgpu/msi_z790p_ddr4_dgpu.config
index 8181b6c72..c1bb9cbaf 100644
--- a/boards/msi_z790p_ddr4_dgpu/msi_z790p_ddr4_dgpu.config
+++ b/boards/msi_z790p_ddr4_dgpu/msi_z790p_ddr4_dgpu.config
@@ -4,7 +4,7 @@ export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=dasharo
 export CONFIG_LINUX_VERSION=6.1.8
 
-CONFIG_COREBOOT_CONFIG=config/coreboot-msi_z790p_ddr4.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-msi_z790p_ddr4_dgpu.config
 CONFIG_LINUX_CONFIG=config/linux-msi-z690-z790.config
 
 CONFIG_KEXEC=y
@@ -24,8 +24,10 @@ CONFIG_DROPBEAR=y
 
 CONFIG_HOTPKEY=y
 
-CONFIG_CAIRO=y
-CONFIG_FBWHIPTAIL=y
+CONFIG_CAIRO=n
+CONFIG_FBWHIPTAIL=n
+CONFIG_NEWT=y
+CONFIG_SLANG=y
 
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_IGC=y
diff --git a/config/coreboot-msi_z790p_ddr4_dgpu.config b/config/coreboot-msi_z790p_ddr4_dgpu.config
index c963e0d0f..a61a26c71 100644
--- a/config/coreboot-msi_z790p_ddr4_dgpu.config
+++ b/config/coreboot-msi_z790p_ddr4_dgpu.config
@@ -119,7 +119,7 @@ CONFIG_MAINBOARD_VENDOR="Micro-Star International Co., Ltd."
 CONFIG_CBFS_SIZE=0x1c00000
 CONFIG_CONSOLE_SERIAL=y
 CONFIG_MAX_CPUS=32
-CONFIG_ONBOARD_VGA_IS_PRIMARY=y
+# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 CONFIG_POST_DEVICE=y
 CONFIG_POST_IO=y
 CONFIG_UART_FOR_CONSOLE=0
@@ -128,7 +128,6 @@ CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_OVERRIDE_DEVICETREE=""
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Micro-Star International Co., Ltd."
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
 # CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0x4000
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
@@ -181,6 +180,7 @@ CONFIG_D3COLD_SUPPORT=y
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_PRE_GRAPHICS_DELAY_MS=0
 CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
 CONFIG_HEAP_SIZE=0x10000
 CONFIG_EC_GPE_SCI=0x50
@@ -230,6 +230,7 @@ CONFIG_SMM_MODULE_STACK_SIZE=0x800
 CONFIG_ACPI_BERT_SIZE=0x0
 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=133
 CONFIG_VBOOT_HASH_BLOCK_SIZE=0x1000
+CONFIG_S3_VGA_ROM_RUN=y
 CONFIG_ACPI_CPU_STRING="CP%02X"
 CONFIG_STACK_SIZE=0x2000
 CONFIG_SOC_INTEL_ALDERLAKE=y
@@ -508,6 +509,7 @@ CONFIG_BIOS_VENDOR="3mdeb"
 # Dasharo Configuration
 #
 CONFIG_DASHARO_PREFER_S3_SLEEP=y
+# CONFIG_DASHARO_FIRMWARE_UPDATE_MODE is not set
 # end of Dasharo Configuration
 
 CONFIG_UDK_BASE=y
@@ -542,19 +544,21 @@ CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS_IN_ALL_STAGES=y
 #
 # Devices
 #
-CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
 CONFIG_HAVE_FSP_GOP=y
-# CONFIG_VGA_ROM_RUN is not set
-CONFIG_RUN_FSP_GOP=y
+CONFIG_VGA_ROM_RUN=y
+# CONFIG_RUN_FSP_GOP is not set
 # CONFIG_NO_GFX_INIT is not set
 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_GENERIC_LINEAR_FRAMEBUFFER=y
-CONFIG_LINEAR_FRAMEBUFFER=y
-CONFIG_BOOTSPLASH=y
+# CONFIG_FRAMEBUFFER_SET_VESA_MODE is not set
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
 # end of Display
 
 CONFIG_PCI=y
@@ -575,7 +579,7 @@ CONFIG_FIRMWARE_CONNECTION_MANAGER=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 CONFIG_INTEL_GMA_HAVE_VBT=y
-CONFIG_INTEL_GMA_ADD_VBT=y
+# CONFIG_INTEL_GMA_ADD_VBT is not set
 # CONFIG_SOFTWARE_I2C is not set
 CONFIG_I2C_TRANSFER_TIMEOUT_US=500000
 # CONFIG_RESOURCE_ALLOCATION_TOP_DOWN is not set
@@ -595,7 +599,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
 # CONFIG_SPI_FLASH_NO_FAST_READ is not set
-# CONFIG_TPM_INIT_RAMSTAGE is not set
+CONFIG_TPM_INIT_RAMSTAGE=y
 # CONFIG_TPM_PPI is not set
 CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -681,7 +685,6 @@ CONFIG_TPM_HASH_SHA256=y
 # CONFIG_TPM_HASH_SHA384 is not set
 # CONFIG_TPM_HASH_SHA512 is not set
 CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
-CONFIG_TPM_MEASURED_BOOT_INIT_BOOTBLOCK=y
 CONFIG_PCR_BOOT_MODE=1
 CONFIG_PCR_HWID=1
 CONFIG_PCR_SRTM=2