From 2f72e90c475f8e3ceeeb1c4ea067798d39c522ce Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Fri, 26 Jun 2015 16:16:46 -0400
Subject: kfsn4-dre: Add CONFIG_VGA=y to the config

Video initialization won't work without it.
---
(limited to 'resources')

diff --git a/resources/libreboot/config/kfsn4-dre/config b/resources/libreboot/config/kfsn4-dre/config
index abca583..6902f78 100644
--- a/resources/libreboot/config/kfsn4-dre/config
+++ b/resources/libreboot/config/kfsn4-dre/config
@@ -162,10 +162,6 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -384,8 +380,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -513,7 +507,7 @@ CONFIG_HAVE_OPTION_TABLE=y
 CONFIG_PCI_IO_CFG_EXT=y
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
-# CONFIG_VGA is not set
+CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -538,8 +532,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/patch/0016-mainboard-asus-kfsn4-dre-Enable-VGA-support.patch b/resources/libreboot/patch/0016-mainboard-asus-kfsn4-dre-Enable-VGA-support.patch
new file mode 100644
index 0000000..98ce60a
--- /dev/null
+++ b/resources/libreboot/patch/0016-mainboard-asus-kfsn4-dre-Enable-VGA-support.patch
@@ -0,0 +1,29 @@
+From 3a8ac6c1ea904ac6885683962ce17c51941ba33d Mon Sep 17 00:00:00 2001
+From: Timothy Pearson <tpearson@raptorengineeringinc.com>
+Date: Fri, 26 Jun 2015 14:56:51 -0500
+Subject: [PATCH] mainboard/asus/kfsn4-dre: Enable VGA support
+
+The ASUS KFSN4-DRE has full native VGA support, enable it
+by default in the Kconfig files.
+
+Change-Id: I09fc8845a30f26ca49f3547812f9784621ff4b5e
+Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
+---
+ src/mainboard/asus/kfsn4-dre/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mainboard/asus/kfsn4-dre/Kconfig b/src/mainboard/asus/kfsn4-dre/Kconfig
+index 9d9ab1e..28b5dcd 100644
+--- a/src/mainboard/asus/kfsn4-dre/Kconfig
++++ b/src/mainboard/asus/kfsn4-dre/Kconfig
+@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
+ 	select MMCONF_SUPPORT_DEFAULT
+ 	select DRIVERS_I2C_W83793
+ 	select DRIVERS_XGI_Z9S
++	select VGA
+ 	select MAINBOARD_HAS_NATIVE_VGA_INIT
+ 	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
+ 
+-- 
+1.9.1
+
diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot
index fb0820b..8341f74 100755
--- a/resources/scripts/helpers/download/coreboot
+++ b/resources/scripts/helpers/download/coreboot
@@ -141,6 +141,12 @@ printf "ec/lenovo/h8: re-factor handling of power_management_beeps\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/31/10531/8 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0015-ec-lenovo-h8-re-factor-handling-of-power_management_.patch"
 
+# Other fixes:
+
+printf "mainboard/asus/kfsn4-dre: Enable VGA support (without it, VGA out won't work on the KFSN4-DRE)\n"
+# git fetch http://review.coreboot.org/coreboot refs/changes/73/10673/1 && git cherry-pick FETCH_HEAD
+git am "../resources/libreboot/patch/0016-mainboard-asus-kfsn4-dre-Enable-VGA-support.patch"
+
 # Run coreboot-libre deblob scripts
 # ------------------------------------------------------------------------------
 
--
cgit v0.9.1