librecore integration preparation: drop post-20160907 coreboot patches

Most of them don't apply, and they are merged upstream in librecore already.

Librecore is becoming Libreboot's main firmware upstream.

67 files changed, 2 insertions, 9976 deletions

diff --git a/resources/libreboot/config/grub/ga-g41m-es2l/cbrevision b/resources/libreboot/config/grub/ga-g41m-es2l/cbrevision
index 4f7158f6..e785a260 100644
--- a/resources/libreboot/config/grub/ga-g41m-es2l/cbrevision
+++ b/resources/libreboot/config/grub/ga-g41m-es2l/cbrevision
@@ -1 +1 @@
-55a54f662e2e793306dc7003afbcb82b49db0a8c
+7c2e5396a3d47c64eb5a553fe412aad4c0f8dc1b
diff --git a/resources/libreboot/config/grub/ga-g41m-es2l/config b/resources/libreboot/config/grub/ga-g41m-es2l/config
index ec4790da..a0c7fc0c 100644
--- a/resources/libreboot/config/grub/ga-g41m-es2l/config
+++ b/resources/libreboot/config/grub/ga-g41m-es2l/config
@@ -139,7 +139,6 @@ CONFIG_BOARD_GIGABYTE_GA_G41M_ES2L=y
 # CONFIG_BOARD_GIGABYTE_MA785GMT is not set
 # CONFIG_BOARD_GIGABYTE_MA78GM is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DEVICETREE="devicetree.cb"
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_CPU_ADDR_BITS=36
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/0005-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/0005-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch
deleted file mode 100644
index 884b2829..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/0005-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 34f8cdbc30f1fdf4700c73aad26e0fc159af70ab Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Fri, 2 Sep 2016 22:35:32 +0200
-Subject: [PATCH 1/2] i945/gma.c use latest linux code to calculate divisors.
-
-The code to compute n, m1, m2, p1 divisors is not correct in coreboot and
-on some targets hits a working mode at lower refresh rate, which is why
-display is working on some targets.
-This patch also fixes reference frequency.
-
-This patch reuses linux code to correctly compute divisors.
-
-The result is that some previously not working displays (Lenovo T60 with
-1024x786, 1400x1050, 2048x1536)
-
-TESTED on T60 with 1024x786.
-
-Change-Id: I2c7f3bb0024ac005029eaebe3ecdc70c38ac777e
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/i945/gma.c | 82 +++++++++++++++++++---------------------
- 1 file changed, 38 insertions(+), 44 deletions(-)
-
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 02caa0a..3f0b5b4 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -26,6 +26,8 @@
- #include <string.h>
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
-+#include <commonlib/helpers.h>
-+
- 
- #include "i945.h"
- #include "chip.h"
-@@ -43,7 +45,7 @@
- #define PGETBL_CTL	0x2020
- #define PGETBL_ENABLED	0x00000001
- 
--#define BASE_FREQUENCY 120000
-+#define BASE_FREQUENCY 100000
- 
- #if CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT
- 
-@@ -85,10 +87,10 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	u8 edid_data[128];
- 	unsigned long temp;
- 	int hpolarity, vpolarity;
--	u32 candp1, candn;
--	u32 best_delta = 0xffffffff;
-+	u32 smallest_err = 0xffffffff;
- 	u32 target_frequency;
- 	u32 pixel_p1 = 1;
-+	u32 pixel_p2;
- 	u32 pixel_n = 1;
- 	u32 pixel_m1 = 1;
- 	u32 pixel_m2 = 1;
-@@ -158,43 +160,37 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	write32(pmmio + PORT_HOTPLUG_EN, conf->gpu_hotplug);
- 	write32(pmmio + INSTPM, 0x08000000 | INSTPM_AGPBUSY_DIS);
- 
--	target_frequency = mode->lvds_dual_channel ? mode->pixel_clock
--		: (2 * mode->pixel_clock);
--
--	/* Find suitable divisors.  */
--	for (candp1 = 1; candp1 <= 8; candp1++) {
--		for (candn = 5; candn <= 10; candn++) {
--			u32 cur_frequency;
--			u32 m; /* 77 - 131.  */
--			u32 denom; /* 35 - 560.  */
--			u32 current_delta;
--
--			denom = candn * candp1 * 7;
--			/* Doesnt overflow for up to
--			   5000000 kHz = 5 GHz.  */
--			m = (target_frequency * denom
--			     + BASE_FREQUENCY / 2) / BASE_FREQUENCY;
--
--			if (m < 77 || m > 131)
--				continue;
--
--			cur_frequency = (BASE_FREQUENCY * m) / denom;
--			if (target_frequency > cur_frequency)
--				current_delta = target_frequency - cur_frequency;
--			else
--				current_delta = cur_frequency - target_frequency;
--
--			if (best_delta > current_delta) {
--				best_delta = current_delta;
--				pixel_n = candn;
--				pixel_p1 = candp1;
--				pixel_m2 = ((m + 3) % 5) + 7;
--				pixel_m1 = (m - pixel_m2) / 5;
-+	pixel_p2 = mode->lvds_dual_channel ? 7 : 14;
-+	target_frequency = mode->pixel_clock;
-+
-+	/* Find suitable divisors, m1, m2, p1, n.  */
-+	/* refclock * (5 * (m1 + 2) + (m1 + 2)) / (n + 2) / p1 / p2 */
-+	/* should be closest to target frequency as possible */
-+	u32 candn, candm1, candm2, candp1;
-+	for (candm1 = 8; candm1 <= 18; candm1++) {
-+		for (candm2 = 3; candm2 <= 7; candm2++) {
-+			for (candn = 1; candn <= 6; candn++) {
-+				for (candp1 = 1; candp1 <= 8; candp1++) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * pixel_p2;
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUENCY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if ((m < 70) || (m > 120))
-+						continue;
-+					if (this_err < smallest_err) {
-+						smallest_err = this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
- 			}
- 		}
- 	}
- 
--	if (best_delta == 0xffffffff) {
-+	if (smallest_err == 0xffffffff) {
- 		printk (BIOS_ERR, "Couldn't find GFX clock divisors\n");
- 		return -1;
- 	}
-@@ -216,8 +212,8 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
- 	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
- 	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
--	       BASE_FREQUENCY * (5 * pixel_m1 + pixel_m2) / pixel_n
--	       / (pixel_p1 * 7));
-+	       BASE_FREQUENCY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2)) /
-+	       (pixel_n + 2) / (pixel_p1 * pixel_p2));
- 
- #if !IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)
- 	write32(pmmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-@@ -242,8 +238,8 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	write32(pmmio + PP_CONTROL, PANEL_UNLOCK_REGS
- 		| (read32(pmmio + PP_CONTROL) & ~PANEL_UNLOCK_MASK));
- 	write32(pmmio + FP0(1),
--		((pixel_n - 2) << 16)
--		| ((pixel_m1 - 2) << 8) | pixel_m2);
-+		(pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
- 	write32(pmmio + DPLL(1),
- 		DPLL_VGA_MODE_DIS |
- 		DPLL_VCO_ENABLE | DPLLB_MODE_LVDS
-@@ -252,8 +248,7 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 		| (conf->gpu_lvds_use_spread_spectrum_clock
- 		   ? DPLL_INTEGRATED_CLOCK_VLV | DPLL_INTEGRATED_CRI_CLK_VLV
- 		   : 0)
--		| (pixel_p1 << 16)
--		| (pixel_p1));
-+		| (0x10000 << pixel_p1));
- 	mdelay(1);
- 	write32(pmmio + DPLL(1),
- 		DPLL_VGA_MODE_DIS |
-@@ -261,8 +256,7 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 		| (mode->lvds_dual_channel ? DPLLB_LVDS_P2_CLOCK_DIV_7
- 		   : DPLLB_LVDS_P2_CLOCK_DIV_14)
- 		| ((conf->gpu_lvds_use_spread_spectrum_clock ? 3 : 0) << 13)
--		| (pixel_p1 << 16)
--		| (pixel_p1));
-+		| (0x10000 << pixel_p1));
- 	mdelay(1);
- 	write32(pmmio + HTOTAL(1),
- 		((hactive + right_border + hblank - 1) << 16)
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/0006-i945-gma.c-add-native-VGA-init.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/0006-i945-gma.c-add-native-VGA-init.patch
deleted file mode 100644
index 26eed5b4..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/0006-i945-gma.c-add-native-VGA-init.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 7ed0951bcf59dfd8b1893232b674455ff8f03f83 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 5 Sep 2016 22:46:11 +0200
-Subject: [PATCH 2/2] i945/gma.c: add native VGA init
-
-This reuses the Intel Pineview native graphic initialization
-to have output on the VGA connector of i945 devices.
-
-The behavior is the same as with the vendor VBIOS BLOB.
-It uses the external VGA display if it is connected.
-
-Change-Id: I7eaee87d16df2e5c9ebeaaff01d36ec1aa4ea495
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/i945/gma.c | 196 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 194 insertions(+), 2 deletions(-)
-
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 3f0b5b4..ac19d5a 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -78,7 +78,7 @@ static int gtt_setup(void *mmiobase)
- 	return 0;
- }
- 
--static int intel_gma_init(struct northbridge_intel_i945_config *conf,
-+static int intel_gma_init_lvds(struct northbridge_intel_i945_config *conf,
- 			  unsigned int pphysbase, unsigned int piobase,
- 			  void *pmmio, unsigned int pgfx)
- {
-@@ -382,6 +382,194 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- #endif
- 	return 0;
- }
-+
-+static int intel_gma_init_vga(struct northbridge_intel_i945_config *conf,
-+			  unsigned int pphysbase, unsigned int piobase,
-+			  void *pmmio, unsigned int pgfx)
-+{
-+	int i;
-+	u32 hactive, vactive;
-+	u16 reg16;
-+	u32 uma_size;
-+
-+	printk(BIOS_SPEW, "pmmio %x addrport %x physbase %x\n",
-+		(u32)pmmio, piobase, pphysbase);
-+
-+	gtt_setup(pmmio);
-+
-+	/* Disable VGA.  */
-+	write32(pmmio + VGACNTRL, VGA_DISP_DISABLE);
-+
-+	/* Disable pipes.  */
-+	write32(pmmio + PIPECONF(0), 0);
-+	write32(pmmio + PIPECONF(1), 0);
-+
-+	write32(pmmio + INSTPM, 0x800);
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(pmmio + VGA0, 0x200074);
-+	write32(pmmio + VGA1, 0x200074);
-+
-+	write32(pmmio + DSPFW3, 0x7f3f00c1 & ~PINEVIEW_SELF_REFRESH_EN);
-+	write32(pmmio + DSPCLK_GATE_D, 0);
-+	write32(pmmio + FW_BLC, 0x03060106);
-+	write32(pmmio + FW_BLC2, 0x00000306);
-+
-+	write32(pmmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(pmmio + 0x7041c, 0x0);
-+
-+	write32(pmmio + DPLL_MD(0), 0x3);
-+	write32(pmmio + DPLL_MD(1), 0x3);
-+	write32(pmmio + DSPCNTR(1), 0x1000000);
-+	write32(pmmio + PIPESRC(1), 0x027f01df);
-+
-+	vga_misc_write(0x67);
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	// Disable screen memory to prevent garbage from appearing.
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(pmmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_VGA_MODE_DIS
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x400601
-+		);
-+	mdelay(1);
-+	write32(pmmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_VGA_MODE_DIS
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x400601
-+		);
-+
-+	write32(pmmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(pmmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(pmmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(pmmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(pmmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(pmmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(pmmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(pmmio + PF_WIN_POS(0), 0);
-+
-+	write32(pmmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(pmmio + PF_CTL(0),PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(pmmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(pmmio + PFIT_CONTROL, 0x0);
-+
-+	mdelay(1);
-+
-+	write32(pmmio + FDI_RX_CTL(0), 0x00002040);
-+	mdelay(1);
-+	write32(pmmio + FDI_RX_CTL(0), 0x80002050);
-+	write32(pmmio + FDI_TX_CTL(0), 0x00044000);
-+	mdelay(1);
-+	write32(pmmio + FDI_TX_CTL(0), 0x80044000);
-+	write32(pmmio + PIPECONF(0), PIPECONF_ENABLE | PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(pmmio + VGACNTRL, 0x0);
-+	write32(pmmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(pmmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(pmmio + DSPFW3, 0x7f3f00c1);
-+	write32(pmmio + MI_MODE, 0x200 | VS_TIMER_DISPATCH);
-+	write32(pmmio + CACHE_MODE_0, (0x6820 | (1 << 9)) & ~(1 << 5));
-+	write32(pmmio + CACHE_MODE_1, 0x380 & ~(1 << 9));
-+
-+	/* Set up GTT.  */
-+
-+	reg16 = pci_read_config16(dev_find_slot(0, PCI_DEVFN(0, 0)), GGC);
-+	uma_size = 0;
-+	if (!(reg16 & 2)) {
-+		uma_size = decode_igd_memory_size((reg16 >> 4) & 7);
-+		printk(BIOS_DEBUG, "%dM UMA\n", uma_size >> 10);
-+	}
-+
-+	for (i = 0; i < (uma_size - 256) / 4; i++)
-+	{
-+		outl((i << 2) | 1, piobase);
-+		outl(pphysbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+	/* Clear interrupts. */
-+	write32(pmmio + DEIIR, 0xffffffff);
-+	write32(pmmio + SDEIIR, 0xffffffff);
-+	write32(pmmio + IIR, 0xffffffff);
-+	write32(pmmio + IMR, 0xffffffff);
-+	write32(pmmio + EIR, 0xffffffff);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	return 0;
-+
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should have a correct header */
-+static int vga_connected(u8 *pmmio) {
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(pmmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(pmmio + GMBUS0);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- #endif
- 
- static void gma_func0_init(struct device *dev)
-@@ -423,7 +611,11 @@ static void gma_func0_init(struct device *dev)
- 	);
- 
- 	int err;
--	err = intel_gma_init(conf, pci_read_config32(dev, 0x5c) & ~0xf,
-+	if (vga_connected(mmiobase))
-+		err = intel_gma_init_vga(conf, pci_read_config32(dev, 0x5c) & ~0xf,
-+					iobase, mmiobase, graphics_base);
-+	else
-+		err = intel_gma_init_lvds(conf, pci_read_config32(dev, 0x5c) & ~0xf,
- 			     iobase, mmiobase, graphics_base);
- 	if (err == 0)
- 		gfx_set_init_done(1);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/0007-i945-gma.c-generate-fake-VBT.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/0007-i945-gma.c-generate-fake-VBT.patch
deleted file mode 100644
index 6f0272fd..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/0007-i945-gma.c-generate-fake-VBT.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 60cc2c4532f63a40486b7c4e891fb87fb6d4ab7f Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Wed, 7 Sep 2016 22:10:57 +0200
-Subject: [PATCH] i945/gma.c: generate fake VBT
-
-This generates a fake VBT for the Intel i945 graphic device.
-i945 supports both the mobile chipset 945gm (calistoga)
-and the desktop chipset 945gc (lakeport),
-which is why a VBT with a different id string
-needs to be created for each target.
-
-The VBT id string is obtained from the vbios blob in the following way:
-"strings vbios.bin | grep VBT".
-
-Change-Id: I8245b12b16a4426efbe1f584d4163fc257231a98
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/i945/gma.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 02caa0a..f0944b9 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -433,6 +433,15 @@ static void gma_func0_init(struct device *dev)
- 			     iobase, mmiobase, graphics_base);
- 	if (err == 0)
- 		gfx_set_init_done(1);
-+	/* Linux relies on VBT for panel info.  */
-+	if (CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM) {
-+		generate_fake_intel_oprom(&conf->gfx, dev,
-+			"$VBT CALISTOGA      ");
-+	}
-+	if (CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC) {
-+		generate_fake_intel_oprom(&conf->gfx, dev,
-+			"$VBT LAKEPORT-G     ");
-+	}
- #endif
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0001-lenovo-t60-add-hda_verb.c.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0001-lenovo-t60-add-hda_verb.c.patch
deleted file mode 100644
index 0b8e146a..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0001-lenovo-t60-add-hda_verb.c.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From bbd04909524d7b9fd2e2b4dbd804801bbde66e44 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Wed, 7 Sep 2016 21:16:21 +0200
-Subject: [PATCH] lenovo/t60: add hda_verb.c
-
-This creates a config for the Lenovo T60 sound card based
-on values taken from vendor bios
-(in /sys/class/sound/hwC0D0/init_pin_configs on linux 3.16).
-The sound card configuration on the vendor bios is the same
-as the one on the Lenovo x60.
-
-It improves the default behavior of the sound card:
-- internal microphone is chosen by default
-- when jack is inserted it is chosen instead of internal speaker
-
-Change-Id: I44e3eaac437fe4ad97ff2b0eb32d36b33222c09b
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/mainboard/lenovo/t60/hda_verb.c | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/src/mainboard/lenovo/t60/hda_verb.c b/src/mainboard/lenovo/t60/hda_verb.c
-index 072a306..dee3e80 100644
---- a/src/mainboard/lenovo/t60/hda_verb.c
-+++ b/src/mainboard/lenovo/t60/hda_verb.c
-@@ -1,7 +1,22 @@
- #include <device/azalia_device.h>
- 
--const u32 cim_verb_data[0] = {};
-+const u32 cim_verb_data[] = {
-+	0x11d41981, /* Codec Vendor / Device ID: Analog Devices AD1981 */
-+	0x17aa2025, /* Subsystem ID */
-+	0x0000000b, /* Number of 4 dword sets */
- 
--const u32 pc_beep_verbs[0] = {};
-+	AZALIA_SUBVENDOR(0x0, 0x17aa2025),
- 
-+	AZALIA_PIN_CFG(0, 0x05, 0xc3014110),
-+	AZALIA_PIN_CFG(0, 0x06, 0x4221401f),
-+	AZALIA_PIN_CFG(0, 0x07, 0x591311f0),
-+	AZALIA_PIN_CFG(0, 0x08, 0xc3a15020),
-+	AZALIA_PIN_CFG(0, 0x09, 0x41813021),
-+	AZALIA_PIN_CFG(0, 0x0a, 0x014470f0),
-+	AZALIA_PIN_CFG(0, 0x16, 0x59f311f0),
-+	AZALIA_PIN_CFG(0, 0x17, 0x59931122),
-+	AZALIA_PIN_CFG(0, 0x18, 0x41a19023),
-+	AZALIA_PIN_CFG(0, 0x19, 0x9933e12e)
-+};
-+const u32 pc_beep_verbs[0] = {};
- AZALIA_ARRAY_SIZES;
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0003-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0003-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch
deleted file mode 100644
index 86bd6cb0..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0003-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 34f8cdbc30f1fdf4700c73aad26e0fc159af70ab Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Fri, 2 Sep 2016 22:35:32 +0200
-Subject: [PATCH] i945/gma.c use latest linux code to calculate divisors.
-
-The code to compute n, m1, m2, p1 divisors is not correct in coreboot and
-on some targets hits a working mode at lower refresh rate, which is why
-display is working on some targets.
-This patch also fixes reference frequency.
-
-This patch reuses linux code to correctly compute divisors.
-
-The result is that some previously not working displays (Lenovo T60 with
-1024x786, 1400x1050, 2048x1536)
-
-TESTED on T60 with 1024x786.
-
-Change-Id: I2c7f3bb0024ac005029eaebe3ecdc70c38ac777e
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/i945/gma.c | 82 +++++++++++++++++++---------------------
- 1 file changed, 38 insertions(+), 44 deletions(-)
-
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 02caa0a..3f0b5b4 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -26,6 +26,8 @@
- #include <string.h>
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
-+#include <commonlib/helpers.h>
-+
- 
- #include "i945.h"
- #include "chip.h"
-@@ -43,7 +45,7 @@
- #define PGETBL_CTL	0x2020
- #define PGETBL_ENABLED	0x00000001
- 
--#define BASE_FREQUENCY 120000
-+#define BASE_FREQUENCY 100000
- 
- #if CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT
- 
-@@ -85,10 +87,10 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	u8 edid_data[128];
- 	unsigned long temp;
- 	int hpolarity, vpolarity;
--	u32 candp1, candn;
--	u32 best_delta = 0xffffffff;
-+	u32 smallest_err = 0xffffffff;
- 	u32 target_frequency;
- 	u32 pixel_p1 = 1;
-+	u32 pixel_p2;
- 	u32 pixel_n = 1;
- 	u32 pixel_m1 = 1;
- 	u32 pixel_m2 = 1;
-@@ -158,43 +160,37 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	write32(pmmio + PORT_HOTPLUG_EN, conf->gpu_hotplug);
- 	write32(pmmio + INSTPM, 0x08000000 | INSTPM_AGPBUSY_DIS);
- 
--	target_frequency = mode->lvds_dual_channel ? mode->pixel_clock
--		: (2 * mode->pixel_clock);
--
--	/* Find suitable divisors.  */
--	for (candp1 = 1; candp1 <= 8; candp1++) {
--		for (candn = 5; candn <= 10; candn++) {
--			u32 cur_frequency;
--			u32 m; /* 77 - 131.  */
--			u32 denom; /* 35 - 560.  */
--			u32 current_delta;
--
--			denom = candn * candp1 * 7;
--			/* Doesnt overflow for up to
--			   5000000 kHz = 5 GHz.  */
--			m = (target_frequency * denom
--			     + BASE_FREQUENCY / 2) / BASE_FREQUENCY;
--
--			if (m < 77 || m > 131)
--				continue;
--
--			cur_frequency = (BASE_FREQUENCY * m) / denom;
--			if (target_frequency > cur_frequency)
--				current_delta = target_frequency - cur_frequency;
--			else
--				current_delta = cur_frequency - target_frequency;
--
--			if (best_delta > current_delta) {
--				best_delta = current_delta;
--				pixel_n = candn;
--				pixel_p1 = candp1;
--				pixel_m2 = ((m + 3) % 5) + 7;
--				pixel_m1 = (m - pixel_m2) / 5;
-+	pixel_p2 = mode->lvds_dual_channel ? 7 : 14;
-+	target_frequency = mode->pixel_clock;
-+
-+	/* Find suitable divisors, m1, m2, p1, n.  */
-+	/* refclock * (5 * (m1 + 2) + (m1 + 2)) / (n + 2) / p1 / p2 */
-+	/* should be closest to target frequency as possible */
-+	u32 candn, candm1, candm2, candp1;
-+	for (candm1 = 8; candm1 <= 18; candm1++) {
-+		for (candm2 = 3; candm2 <= 7; candm2++) {
-+			for (candn = 1; candn <= 6; candn++) {
-+				for (candp1 = 1; candp1 <= 8; candp1++) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * pixel_p2;
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUENCY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if ((m < 70) || (m > 120))
-+						continue;
-+					if (this_err < smallest_err) {
-+						smallest_err = this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
- 			}
- 		}
- 	}
- 
--	if (best_delta == 0xffffffff) {
-+	if (smallest_err == 0xffffffff) {
- 		printk (BIOS_ERR, "Couldn't find GFX clock divisors\n");
- 		return -1;
- 	}
-@@ -216,8 +212,8 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
- 	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
- 	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
--	       BASE_FREQUENCY * (5 * pixel_m1 + pixel_m2) / pixel_n
--	       / (pixel_p1 * 7));
-+	       BASE_FREQUENCY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2)) /
-+	       (pixel_n + 2) / (pixel_p1 * pixel_p2));
- 
- #if !IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)
- 	write32(pmmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-@@ -242,8 +238,8 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	write32(pmmio + PP_CONTROL, PANEL_UNLOCK_REGS
- 		| (read32(pmmio + PP_CONTROL) & ~PANEL_UNLOCK_MASK));
- 	write32(pmmio + FP0(1),
--		((pixel_n - 2) << 16)
--		| ((pixel_m1 - 2) << 8) | pixel_m2);
-+		(pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
- 	write32(pmmio + DPLL(1),
- 		DPLL_VGA_MODE_DIS |
- 		DPLL_VCO_ENABLE | DPLLB_MODE_LVDS
-@@ -252,8 +248,7 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 		| (conf->gpu_lvds_use_spread_spectrum_clock
- 		   ? DPLL_INTEGRATED_CLOCK_VLV | DPLL_INTEGRATED_CRI_CLK_VLV
- 		   : 0)
--		| (pixel_p1 << 16)
--		| (pixel_p1));
-+		| (0x10000 << pixel_p1));
- 	mdelay(1);
- 	write32(pmmio + DPLL(1),
- 		DPLL_VGA_MODE_DIS |
-@@ -261,8 +256,7 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 		| (mode->lvds_dual_channel ? DPLLB_LVDS_P2_CLOCK_DIV_7
- 		   : DPLLB_LVDS_P2_CLOCK_DIV_14)
- 		| ((conf->gpu_lvds_use_spread_spectrum_clock ? 3 : 0) << 13)
--		| (pixel_p1 << 16)
--		| (pixel_p1));
-+		| (0x10000 << pixel_p1));
- 	mdelay(1);
- 	write32(pmmio + HTOTAL(1),
- 		((hactive + right_border + hblank - 1) << 16)
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0005-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0005-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch
deleted file mode 100644
index 884b2829..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0005-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 34f8cdbc30f1fdf4700c73aad26e0fc159af70ab Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Fri, 2 Sep 2016 22:35:32 +0200
-Subject: [PATCH 1/2] i945/gma.c use latest linux code to calculate divisors.
-
-The code to compute n, m1, m2, p1 divisors is not correct in coreboot and
-on some targets hits a working mode at lower refresh rate, which is why
-display is working on some targets.
-This patch also fixes reference frequency.
-
-This patch reuses linux code to correctly compute divisors.
-
-The result is that some previously not working displays (Lenovo T60 with
-1024x786, 1400x1050, 2048x1536)
-
-TESTED on T60 with 1024x786.
-
-Change-Id: I2c7f3bb0024ac005029eaebe3ecdc70c38ac777e
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/i945/gma.c | 82 +++++++++++++++++++---------------------
- 1 file changed, 38 insertions(+), 44 deletions(-)
-
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 02caa0a..3f0b5b4 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -26,6 +26,8 @@
- #include <string.h>
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
-+#include <commonlib/helpers.h>
-+
- 
- #include "i945.h"
- #include "chip.h"
-@@ -43,7 +45,7 @@
- #define PGETBL_CTL	0x2020
- #define PGETBL_ENABLED	0x00000001
- 
--#define BASE_FREQUENCY 120000
-+#define BASE_FREQUENCY 100000
- 
- #if CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT
- 
-@@ -85,10 +87,10 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	u8 edid_data[128];
- 	unsigned long temp;
- 	int hpolarity, vpolarity;
--	u32 candp1, candn;
--	u32 best_delta = 0xffffffff;
-+	u32 smallest_err = 0xffffffff;
- 	u32 target_frequency;
- 	u32 pixel_p1 = 1;
-+	u32 pixel_p2;
- 	u32 pixel_n = 1;
- 	u32 pixel_m1 = 1;
- 	u32 pixel_m2 = 1;
-@@ -158,43 +160,37 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	write32(pmmio + PORT_HOTPLUG_EN, conf->gpu_hotplug);
- 	write32(pmmio + INSTPM, 0x08000000 | INSTPM_AGPBUSY_DIS);
- 
--	target_frequency = mode->lvds_dual_channel ? mode->pixel_clock
--		: (2 * mode->pixel_clock);
--
--	/* Find suitable divisors.  */
--	for (candp1 = 1; candp1 <= 8; candp1++) {
--		for (candn = 5; candn <= 10; candn++) {
--			u32 cur_frequency;
--			u32 m; /* 77 - 131.  */
--			u32 denom; /* 35 - 560.  */
--			u32 current_delta;
--
--			denom = candn * candp1 * 7;
--			/* Doesnt overflow for up to
--			   5000000 kHz = 5 GHz.  */
--			m = (target_frequency * denom
--			     + BASE_FREQUENCY / 2) / BASE_FREQUENCY;
--
--			if (m < 77 || m > 131)
--				continue;
--
--			cur_frequency = (BASE_FREQUENCY * m) / denom;
--			if (target_frequency > cur_frequency)
--				current_delta = target_frequency - cur_frequency;
--			else
--				current_delta = cur_frequency - target_frequency;
--
--			if (best_delta > current_delta) {
--				best_delta = current_delta;
--				pixel_n = candn;
--				pixel_p1 = candp1;
--				pixel_m2 = ((m + 3) % 5) + 7;
--				pixel_m1 = (m - pixel_m2) / 5;
-+	pixel_p2 = mode->lvds_dual_channel ? 7 : 14;
-+	target_frequency = mode->pixel_clock;
-+
-+	/* Find suitable divisors, m1, m2, p1, n.  */
-+	/* refclock * (5 * (m1 + 2) + (m1 + 2)) / (n + 2) / p1 / p2 */
-+	/* should be closest to target frequency as possible */
-+	u32 candn, candm1, candm2, candp1;
-+	for (candm1 = 8; candm1 <= 18; candm1++) {
-+		for (candm2 = 3; candm2 <= 7; candm2++) {
-+			for (candn = 1; candn <= 6; candn++) {
-+				for (candp1 = 1; candp1 <= 8; candp1++) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * pixel_p2;
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUENCY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if ((m < 70) || (m > 120))
-+						continue;
-+					if (this_err < smallest_err) {
-+						smallest_err = this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
- 			}
- 		}
- 	}
- 
--	if (best_delta == 0xffffffff) {
-+	if (smallest_err == 0xffffffff) {
- 		printk (BIOS_ERR, "Couldn't find GFX clock divisors\n");
- 		return -1;
- 	}
-@@ -216,8 +212,8 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
- 	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
- 	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
--	       BASE_FREQUENCY * (5 * pixel_m1 + pixel_m2) / pixel_n
--	       / (pixel_p1 * 7));
-+	       BASE_FREQUENCY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2)) /
-+	       (pixel_n + 2) / (pixel_p1 * pixel_p2));
- 
- #if !IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)
- 	write32(pmmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-@@ -242,8 +238,8 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	write32(pmmio + PP_CONTROL, PANEL_UNLOCK_REGS
- 		| (read32(pmmio + PP_CONTROL) & ~PANEL_UNLOCK_MASK));
- 	write32(pmmio + FP0(1),
--		((pixel_n - 2) << 16)
--		| ((pixel_m1 - 2) << 8) | pixel_m2);
-+		(pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
- 	write32(pmmio + DPLL(1),
- 		DPLL_VGA_MODE_DIS |
- 		DPLL_VCO_ENABLE | DPLLB_MODE_LVDS
-@@ -252,8 +248,7 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 		| (conf->gpu_lvds_use_spread_spectrum_clock
- 		   ? DPLL_INTEGRATED_CLOCK_VLV | DPLL_INTEGRATED_CRI_CLK_VLV
- 		   : 0)
--		| (pixel_p1 << 16)
--		| (pixel_p1));
-+		| (0x10000 << pixel_p1));
- 	mdelay(1);
- 	write32(pmmio + DPLL(1),
- 		DPLL_VGA_MODE_DIS |
-@@ -261,8 +256,7 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 		| (mode->lvds_dual_channel ? DPLLB_LVDS_P2_CLOCK_DIV_7
- 		   : DPLLB_LVDS_P2_CLOCK_DIV_14)
- 		| ((conf->gpu_lvds_use_spread_spectrum_clock ? 3 : 0) << 13)
--		| (pixel_p1 << 16)
--		| (pixel_p1));
-+		| (0x10000 << pixel_p1));
- 	mdelay(1);
- 	write32(pmmio + HTOTAL(1),
- 		((hactive + right_border + hblank - 1) << 16)
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0006-i945-gma.c-add-native-VGA-init.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0006-i945-gma.c-add-native-VGA-init.patch
deleted file mode 100644
index 26eed5b4..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0006-i945-gma.c-add-native-VGA-init.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 7ed0951bcf59dfd8b1893232b674455ff8f03f83 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 5 Sep 2016 22:46:11 +0200
-Subject: [PATCH 2/2] i945/gma.c: add native VGA init
-
-This reuses the Intel Pineview native graphic initialization
-to have output on the VGA connector of i945 devices.
-
-The behavior is the same as with the vendor VBIOS BLOB.
-It uses the external VGA display if it is connected.
-
-Change-Id: I7eaee87d16df2e5c9ebeaaff01d36ec1aa4ea495
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/i945/gma.c | 196 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 194 insertions(+), 2 deletions(-)
-
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 3f0b5b4..ac19d5a 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -78,7 +78,7 @@ static int gtt_setup(void *mmiobase)
- 	return 0;
- }
- 
--static int intel_gma_init(struct northbridge_intel_i945_config *conf,
-+static int intel_gma_init_lvds(struct northbridge_intel_i945_config *conf,
- 			  unsigned int pphysbase, unsigned int piobase,
- 			  void *pmmio, unsigned int pgfx)
- {
-@@ -382,6 +382,194 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- #endif
- 	return 0;
- }
-+
-+static int intel_gma_init_vga(struct northbridge_intel_i945_config *conf,
-+			  unsigned int pphysbase, unsigned int piobase,
-+			  void *pmmio, unsigned int pgfx)
-+{
-+	int i;
-+	u32 hactive, vactive;
-+	u16 reg16;
-+	u32 uma_size;
-+
-+	printk(BIOS_SPEW, "pmmio %x addrport %x physbase %x\n",
-+		(u32)pmmio, piobase, pphysbase);
-+
-+	gtt_setup(pmmio);
-+
-+	/* Disable VGA.  */
-+	write32(pmmio + VGACNTRL, VGA_DISP_DISABLE);
-+
-+	/* Disable pipes.  */
-+	write32(pmmio + PIPECONF(0), 0);
-+	write32(pmmio + PIPECONF(1), 0);
-+
-+	write32(pmmio + INSTPM, 0x800);
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(pmmio + VGA0, 0x200074);
-+	write32(pmmio + VGA1, 0x200074);
-+
-+	write32(pmmio + DSPFW3, 0x7f3f00c1 & ~PINEVIEW_SELF_REFRESH_EN);
-+	write32(pmmio + DSPCLK_GATE_D, 0);
-+	write32(pmmio + FW_BLC, 0x03060106);
-+	write32(pmmio + FW_BLC2, 0x00000306);
-+
-+	write32(pmmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(pmmio + 0x7041c, 0x0);
-+
-+	write32(pmmio + DPLL_MD(0), 0x3);
-+	write32(pmmio + DPLL_MD(1), 0x3);
-+	write32(pmmio + DSPCNTR(1), 0x1000000);
-+	write32(pmmio + PIPESRC(1), 0x027f01df);
-+
-+	vga_misc_write(0x67);
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	// Disable screen memory to prevent garbage from appearing.
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(pmmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_VGA_MODE_DIS
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x400601
-+		);
-+	mdelay(1);
-+	write32(pmmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_VGA_MODE_DIS
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x400601
-+		);
-+
-+	write32(pmmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(pmmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(pmmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(pmmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(pmmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(pmmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(pmmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(pmmio + PF_WIN_POS(0), 0);
-+
-+	write32(pmmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(pmmio + PF_CTL(0),PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(pmmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(pmmio + PFIT_CONTROL, 0x0);
-+
-+	mdelay(1);
-+
-+	write32(pmmio + FDI_RX_CTL(0), 0x00002040);
-+	mdelay(1);
-+	write32(pmmio + FDI_RX_CTL(0), 0x80002050);
-+	write32(pmmio + FDI_TX_CTL(0), 0x00044000);
-+	mdelay(1);
-+	write32(pmmio + FDI_TX_CTL(0), 0x80044000);
-+	write32(pmmio + PIPECONF(0), PIPECONF_ENABLE | PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(pmmio + VGACNTRL, 0x0);
-+	write32(pmmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(pmmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(pmmio + DSPFW3, 0x7f3f00c1);
-+	write32(pmmio + MI_MODE, 0x200 | VS_TIMER_DISPATCH);
-+	write32(pmmio + CACHE_MODE_0, (0x6820 | (1 << 9)) & ~(1 << 5));
-+	write32(pmmio + CACHE_MODE_1, 0x380 & ~(1 << 9));
-+
-+	/* Set up GTT.  */
-+
-+	reg16 = pci_read_config16(dev_find_slot(0, PCI_DEVFN(0, 0)), GGC);
-+	uma_size = 0;
-+	if (!(reg16 & 2)) {
-+		uma_size = decode_igd_memory_size((reg16 >> 4) & 7);
-+		printk(BIOS_DEBUG, "%dM UMA\n", uma_size >> 10);
-+	}
-+
-+	for (i = 0; i < (uma_size - 256) / 4; i++)
-+	{
-+		outl((i << 2) | 1, piobase);
-+		outl(pphysbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+	/* Clear interrupts. */
-+	write32(pmmio + DEIIR, 0xffffffff);
-+	write32(pmmio + SDEIIR, 0xffffffff);
-+	write32(pmmio + IIR, 0xffffffff);
-+	write32(pmmio + IMR, 0xffffffff);
-+	write32(pmmio + EIR, 0xffffffff);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	return 0;
-+
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should have a correct header */
-+static int vga_connected(u8 *pmmio) {
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(pmmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(pmmio + GMBUS0);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- #endif
- 
- static void gma_func0_init(struct device *dev)
-@@ -423,7 +611,11 @@ static void gma_func0_init(struct device *dev)
- 	);
- 
- 	int err;
--	err = intel_gma_init(conf, pci_read_config32(dev, 0x5c) & ~0xf,
-+	if (vga_connected(mmiobase))
-+		err = intel_gma_init_vga(conf, pci_read_config32(dev, 0x5c) & ~0xf,
-+					iobase, mmiobase, graphics_base);
-+	else
-+		err = intel_gma_init_lvds(conf, pci_read_config32(dev, 0x5c) & ~0xf,
- 			     iobase, mmiobase, graphics_base);
- 	if (err == 0)
- 		gfx_set_init_done(1);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0007-i945-gma.c-generate-fake-VBT.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0007-i945-gma.c-generate-fake-VBT.patch
deleted file mode 100644
index 6f0272fd..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0007-i945-gma.c-generate-fake-VBT.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 60cc2c4532f63a40486b7c4e891fb87fb6d4ab7f Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Wed, 7 Sep 2016 22:10:57 +0200
-Subject: [PATCH] i945/gma.c: generate fake VBT
-
-This generates a fake VBT for the Intel i945 graphic device.
-i945 supports both the mobile chipset 945gm (calistoga)
-and the desktop chipset 945gc (lakeport),
-which is why a VBT with a different id string
-needs to be created for each target.
-
-The VBT id string is obtained from the vbios blob in the following way:
-"strings vbios.bin | grep VBT".
-
-Change-Id: I8245b12b16a4426efbe1f584d4163fc257231a98
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/i945/gma.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 02caa0a..f0944b9 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -433,6 +433,15 @@ static void gma_func0_init(struct device *dev)
- 			     iobase, mmiobase, graphics_base);
- 	if (err == 0)
- 		gfx_set_init_done(1);
-+	/* Linux relies on VBT for panel info.  */
-+	if (CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM) {
-+		generate_fake_intel_oprom(&conf->gfx, dev,
-+			"$VBT CALISTOGA      ");
-+	}
-+	if (CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC) {
-+		generate_fake_intel_oprom(&conf->gfx, dev,
-+			"$VBT LAKEPORT-G     ");
-+	}
- #endif
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0005-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0005-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch
deleted file mode 100644
index 884b2829..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0005-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 34f8cdbc30f1fdf4700c73aad26e0fc159af70ab Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Fri, 2 Sep 2016 22:35:32 +0200
-Subject: [PATCH 1/2] i945/gma.c use latest linux code to calculate divisors.
-
-The code to compute n, m1, m2, p1 divisors is not correct in coreboot and
-on some targets hits a working mode at lower refresh rate, which is why
-display is working on some targets.
-This patch also fixes reference frequency.
-
-This patch reuses linux code to correctly compute divisors.
-
-The result is that some previously not working displays (Lenovo T60 with
-1024x786, 1400x1050, 2048x1536)
-
-TESTED on T60 with 1024x786.
-
-Change-Id: I2c7f3bb0024ac005029eaebe3ecdc70c38ac777e
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/i945/gma.c | 82 +++++++++++++++++++---------------------
- 1 file changed, 38 insertions(+), 44 deletions(-)
-
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 02caa0a..3f0b5b4 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -26,6 +26,8 @@
- #include <string.h>
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
-+#include <commonlib/helpers.h>
-+
- 
- #include "i945.h"
- #include "chip.h"
-@@ -43,7 +45,7 @@
- #define PGETBL_CTL	0x2020
- #define PGETBL_ENABLED	0x00000001
- 
--#define BASE_FREQUENCY 120000
-+#define BASE_FREQUENCY 100000
- 
- #if CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT
- 
-@@ -85,10 +87,10 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	u8 edid_data[128];
- 	unsigned long temp;
- 	int hpolarity, vpolarity;
--	u32 candp1, candn;
--	u32 best_delta = 0xffffffff;
-+	u32 smallest_err = 0xffffffff;
- 	u32 target_frequency;
- 	u32 pixel_p1 = 1;
-+	u32 pixel_p2;
- 	u32 pixel_n = 1;
- 	u32 pixel_m1 = 1;
- 	u32 pixel_m2 = 1;
-@@ -158,43 +160,37 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	write32(pmmio + PORT_HOTPLUG_EN, conf->gpu_hotplug);
- 	write32(pmmio + INSTPM, 0x08000000 | INSTPM_AGPBUSY_DIS);
- 
--	target_frequency = mode->lvds_dual_channel ? mode->pixel_clock
--		: (2 * mode->pixel_clock);
--
--	/* Find suitable divisors.  */
--	for (candp1 = 1; candp1 <= 8; candp1++) {
--		for (candn = 5; candn <= 10; candn++) {
--			u32 cur_frequency;
--			u32 m; /* 77 - 131.  */
--			u32 denom; /* 35 - 560.  */
--			u32 current_delta;
--
--			denom = candn * candp1 * 7;
--			/* Doesnt overflow for up to
--			   5000000 kHz = 5 GHz.  */
--			m = (target_frequency * denom
--			     + BASE_FREQUENCY / 2) / BASE_FREQUENCY;
--
--			if (m < 77 || m > 131)
--				continue;
--
--			cur_frequency = (BASE_FREQUENCY * m) / denom;
--			if (target_frequency > cur_frequency)
--				current_delta = target_frequency - cur_frequency;
--			else
--				current_delta = cur_frequency - target_frequency;
--
--			if (best_delta > current_delta) {
--				best_delta = current_delta;
--				pixel_n = candn;
--				pixel_p1 = candp1;
--				pixel_m2 = ((m + 3) % 5) + 7;
--				pixel_m1 = (m - pixel_m2) / 5;
-+	pixel_p2 = mode->lvds_dual_channel ? 7 : 14;
-+	target_frequency = mode->pixel_clock;
-+
-+	/* Find suitable divisors, m1, m2, p1, n.  */
-+	/* refclock * (5 * (m1 + 2) + (m1 + 2)) / (n + 2) / p1 / p2 */
-+	/* should be closest to target frequency as possible */
-+	u32 candn, candm1, candm2, candp1;
-+	for (candm1 = 8; candm1 <= 18; candm1++) {
-+		for (candm2 = 3; candm2 <= 7; candm2++) {
-+			for (candn = 1; candn <= 6; candn++) {
-+				for (candp1 = 1; candp1 <= 8; candp1++) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * pixel_p2;
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUENCY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if ((m < 70) || (m > 120))
-+						continue;
-+					if (this_err < smallest_err) {
-+						smallest_err = this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
- 			}
- 		}
- 	}
- 
--	if (best_delta == 0xffffffff) {
-+	if (smallest_err == 0xffffffff) {
- 		printk (BIOS_ERR, "Couldn't find GFX clock divisors\n");
- 		return -1;
- 	}
-@@ -216,8 +212,8 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
- 	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
- 	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
--	       BASE_FREQUENCY * (5 * pixel_m1 + pixel_m2) / pixel_n
--	       / (pixel_p1 * 7));
-+	       BASE_FREQUENCY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2)) /
-+	       (pixel_n + 2) / (pixel_p1 * pixel_p2));
- 
- #if !IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)
- 	write32(pmmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-@@ -242,8 +238,8 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 	write32(pmmio + PP_CONTROL, PANEL_UNLOCK_REGS
- 		| (read32(pmmio + PP_CONTROL) & ~PANEL_UNLOCK_MASK));
- 	write32(pmmio + FP0(1),
--		((pixel_n - 2) << 16)
--		| ((pixel_m1 - 2) << 8) | pixel_m2);
-+		(pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
- 	write32(pmmio + DPLL(1),
- 		DPLL_VGA_MODE_DIS |
- 		DPLL_VCO_ENABLE | DPLLB_MODE_LVDS
-@@ -252,8 +248,7 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 		| (conf->gpu_lvds_use_spread_spectrum_clock
- 		   ? DPLL_INTEGRATED_CLOCK_VLV | DPLL_INTEGRATED_CRI_CLK_VLV
- 		   : 0)
--		| (pixel_p1 << 16)
--		| (pixel_p1));
-+		| (0x10000 << pixel_p1));
- 	mdelay(1);
- 	write32(pmmio + DPLL(1),
- 		DPLL_VGA_MODE_DIS |
-@@ -261,8 +256,7 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 		| (mode->lvds_dual_channel ? DPLLB_LVDS_P2_CLOCK_DIV_7
- 		   : DPLLB_LVDS_P2_CLOCK_DIV_14)
- 		| ((conf->gpu_lvds_use_spread_spectrum_clock ? 3 : 0) << 13)
--		| (pixel_p1 << 16)
--		| (pixel_p1));
-+		| (0x10000 << pixel_p1));
- 	mdelay(1);
- 	write32(pmmio + HTOTAL(1),
- 		((hactive + right_border + hblank - 1) << 16)
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0006-i945-gma.c-add-native-VGA-init.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0006-i945-gma.c-add-native-VGA-init.patch
deleted file mode 100644
index 26eed5b4..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0006-i945-gma.c-add-native-VGA-init.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 7ed0951bcf59dfd8b1893232b674455ff8f03f83 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 5 Sep 2016 22:46:11 +0200
-Subject: [PATCH 2/2] i945/gma.c: add native VGA init
-
-This reuses the Intel Pineview native graphic initialization
-to have output on the VGA connector of i945 devices.
-
-The behavior is the same as with the vendor VBIOS BLOB.
-It uses the external VGA display if it is connected.
-
-Change-Id: I7eaee87d16df2e5c9ebeaaff01d36ec1aa4ea495
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/i945/gma.c | 196 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 194 insertions(+), 2 deletions(-)
-
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 3f0b5b4..ac19d5a 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -78,7 +78,7 @@ static int gtt_setup(void *mmiobase)
- 	return 0;
- }
- 
--static int intel_gma_init(struct northbridge_intel_i945_config *conf,
-+static int intel_gma_init_lvds(struct northbridge_intel_i945_config *conf,
- 			  unsigned int pphysbase, unsigned int piobase,
- 			  void *pmmio, unsigned int pgfx)
- {
-@@ -382,6 +382,194 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- #endif
- 	return 0;
- }
-+
-+static int intel_gma_init_vga(struct northbridge_intel_i945_config *conf,
-+			  unsigned int pphysbase, unsigned int piobase,
-+			  void *pmmio, unsigned int pgfx)
-+{
-+	int i;
-+	u32 hactive, vactive;
-+	u16 reg16;
-+	u32 uma_size;
-+
-+	printk(BIOS_SPEW, "pmmio %x addrport %x physbase %x\n",
-+		(u32)pmmio, piobase, pphysbase);
-+
-+	gtt_setup(pmmio);
-+
-+	/* Disable VGA.  */
-+	write32(pmmio + VGACNTRL, VGA_DISP_DISABLE);
-+
-+	/* Disable pipes.  */
-+	write32(pmmio + PIPECONF(0), 0);
-+	write32(pmmio + PIPECONF(1), 0);
-+
-+	write32(pmmio + INSTPM, 0x800);
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(pmmio + VGA0, 0x200074);
-+	write32(pmmio + VGA1, 0x200074);
-+
-+	write32(pmmio + DSPFW3, 0x7f3f00c1 & ~PINEVIEW_SELF_REFRESH_EN);
-+	write32(pmmio + DSPCLK_GATE_D, 0);
-+	write32(pmmio + FW_BLC, 0x03060106);
-+	write32(pmmio + FW_BLC2, 0x00000306);
-+
-+	write32(pmmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(pmmio + 0x7041c, 0x0);
-+
-+	write32(pmmio + DPLL_MD(0), 0x3);
-+	write32(pmmio + DPLL_MD(1), 0x3);
-+	write32(pmmio + DSPCNTR(1), 0x1000000);
-+	write32(pmmio + PIPESRC(1), 0x027f01df);
-+
-+	vga_misc_write(0x67);
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	// Disable screen memory to prevent garbage from appearing.
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(pmmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_VGA_MODE_DIS
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x400601
-+		);
-+	mdelay(1);
-+	write32(pmmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_VGA_MODE_DIS
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x400601
-+		);
-+
-+	write32(pmmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(pmmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(pmmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(pmmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(pmmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(pmmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(pmmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(pmmio + PF_WIN_POS(0), 0);
-+
-+	write32(pmmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(pmmio + PF_CTL(0),PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(pmmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(pmmio + PFIT_CONTROL, 0x0);
-+
-+	mdelay(1);
-+
-+	write32(pmmio + FDI_RX_CTL(0), 0x00002040);
-+	mdelay(1);
-+	write32(pmmio + FDI_RX_CTL(0), 0x80002050);
-+	write32(pmmio + FDI_TX_CTL(0), 0x00044000);
-+	mdelay(1);
-+	write32(pmmio + FDI_TX_CTL(0), 0x80044000);
-+	write32(pmmio + PIPECONF(0), PIPECONF_ENABLE | PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(pmmio + VGACNTRL, 0x0);
-+	write32(pmmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(pmmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(pmmio + DSPFW3, 0x7f3f00c1);
-+	write32(pmmio + MI_MODE, 0x200 | VS_TIMER_DISPATCH);
-+	write32(pmmio + CACHE_MODE_0, (0x6820 | (1 << 9)) & ~(1 << 5));
-+	write32(pmmio + CACHE_MODE_1, 0x380 & ~(1 << 9));
-+
-+	/* Set up GTT.  */
-+
-+	reg16 = pci_read_config16(dev_find_slot(0, PCI_DEVFN(0, 0)), GGC);
-+	uma_size = 0;
-+	if (!(reg16 & 2)) {
-+		uma_size = decode_igd_memory_size((reg16 >> 4) & 7);
-+		printk(BIOS_DEBUG, "%dM UMA\n", uma_size >> 10);
-+	}
-+
-+	for (i = 0; i < (uma_size - 256) / 4; i++)
-+	{
-+		outl((i << 2) | 1, piobase);
-+		outl(pphysbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+	/* Clear interrupts. */
-+	write32(pmmio + DEIIR, 0xffffffff);
-+	write32(pmmio + SDEIIR, 0xffffffff);
-+	write32(pmmio + IIR, 0xffffffff);
-+	write32(pmmio + IMR, 0xffffffff);
-+	write32(pmmio + EIR, 0xffffffff);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	return 0;
-+
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should have a correct header */
-+static int vga_connected(u8 *pmmio) {
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(pmmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(pmmio + GMBUS0);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- #endif
- 
- static void gma_func0_init(struct device *dev)
-@@ -423,7 +611,11 @@ static void gma_func0_init(struct device *dev)
- 	);
- 
- 	int err;
--	err = intel_gma_init(conf, pci_read_config32(dev, 0x5c) & ~0xf,
-+	if (vga_connected(mmiobase))
-+		err = intel_gma_init_vga(conf, pci_read_config32(dev, 0x5c) & ~0xf,
-+					iobase, mmiobase, graphics_base);
-+	else
-+		err = intel_gma_init_lvds(conf, pci_read_config32(dev, 0x5c) & ~0xf,
- 			     iobase, mmiobase, graphics_base);
- 	if (err == 0)
- 		gfx_set_init_done(1);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0007-i945-gma.c-generate-fake-VBT.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0007-i945-gma.c-generate-fake-VBT.patch
deleted file mode 100644
index 6f0272fd..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0007-i945-gma.c-generate-fake-VBT.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 60cc2c4532f63a40486b7c4e891fb87fb6d4ab7f Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Wed, 7 Sep 2016 22:10:57 +0200
-Subject: [PATCH] i945/gma.c: generate fake VBT
-
-This generates a fake VBT for the Intel i945 graphic device.
-i945 supports both the mobile chipset 945gm (calistoga)
-and the desktop chipset 945gc (lakeport),
-which is why a VBT with a different id string
-needs to be created for each target.
-
-The VBT id string is obtained from the vbios blob in the following way:
-"strings vbios.bin | grep VBT".
-
-Change-Id: I8245b12b16a4426efbe1f584d4163fc257231a98
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/i945/gma.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 02caa0a..f0944b9 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -433,6 +433,15 @@ static void gma_func0_init(struct device *dev)
- 			     iobase, mmiobase, graphics_base);
- 	if (err == 0)
- 		gfx_set_init_done(1);
-+	/* Linux relies on VBT for panel info.  */
-+	if (CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM) {
-+		generate_fake_intel_oprom(&conf->gfx, dev,
-+			"$VBT CALISTOGA      ");
-+	}
-+	if (CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC) {
-+		generate_fake_intel_oprom(&conf->gfx, dev,
-+			"$VBT LAKEPORT-G     ");
-+	}
- #endif
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/grub/ga-g41m-es2l/0001-x4x-gma.c-Add-VESA-native-resolution-mode.patch b/resources/libreboot/patch/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/grub/ga-g41m-es2l/0001-x4x-gma.c-Add-VESA-native-resolution-mode.patch
deleted file mode 100644
index 187dbc9a..00000000
--- a/resources/libreboot/patch/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/grub/ga-g41m-es2l/0001-x4x-gma.c-Add-VESA-native-resolution-mode.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-From 9659556d9edbba6c3530ed1d0630add30419210f Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sun, 4 Sep 2016 16:01:11 +0200
-Subject: [PATCH 1/2] x4x/gma.c: Add VESA native resolution mode
-
-This patch implements native resolution, VESA mode, on the VGA output of
-x4x.
-
-It relies on EDID to modeset, but has a fallback-mode (640 x 480 @
-60Hz) if this is no EDID could be found. This fallback mode only works in textmode
-since in VESA mode some payloads (grub2) rely on VBE info, which is being
-generated from an EDID.
-
-Change-Id: I247ea7171ba3c5dc3b209d00e4dcb2d2069abd75
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/x4x/gma.c | 282 ++++++++++++++++++++++++++++++++++------
- 1 file changed, 242 insertions(+), 40 deletions(-)
-
-diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
-index 2679026..118f98d 100644
---- a/src/northbridge/intel/x4x/gma.c
-+++ b/src/northbridge/intel/x4x/gma.c
-@@ -26,24 +26,68 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
- #include "x4x.h"
- #include <drivers/intel/gma/intel_bios.h>
-+#include <drivers/intel/gma/edid.h>
- #include <drivers/intel/gma/i915.h>
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUENCY 96000
-+
-+static u8 edid_is_null(u8 *edid, u32 edid_size)
-+{
-+	u32 i;
-+	for (i = 0; i < edid_size; i++) {
-+		if (*(edid + i) != 0)
-+			return 0;
-+	}
-+	return 1;
-+}
- static void intel_gma_init(const struct northbridge_intel_x4x_config *info,
--			   u8 *mmio)
-+			u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-+
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u8 edid_not_found;
-+
-+	/* Initialise mode variables for 640 x 480 @ 60Hz */
-+	u32 hactive = 640, vactive = 480;
-+	u32 right_border = 0, bottom_border = 0;
-+	int hpolarity = 0, vpolarity = 0;
-+	u32 hsync = 96, vsync = 2;
-+	u32 hblank = 160, vblank = 45;
-+	u32 hfront_porch = 16, vfront_porch = 10;
-+	u32 target_frequency = 25175;
-+
-+	u32 err_most = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Set up GTT */
-+	for (i = 0; i < 0x1000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -73,107 +117,258 @@ static void intel_gma_init(const struct northbridge_intel_x4x_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	edid_not_found = edid_is_null(edid_data, sizeof(edid_data));
-+	if (!edid_not_found) {
-+		printk(BIOS_DEBUG, "EDID is not null");
-+		hactive = edid.x_resolution;
-+		vactive = edid.y_resolution;
-+		right_border = mode->hborder;
-+		bottom_border = mode->vborder;
-+		hpolarity = (mode->phsync == '-');
-+		vpolarity = (mode->pvsync == '-');
-+		vsync = mode->vspw;
-+		hsync = mode->hspw;
-+		vblank = mode->vbl;
-+		hblank = mode->hbl;
-+		hfront_porch = mode->hso;
-+		vfront_porch = mode->vso;
-+		target_frequency = mode->pixel_clock;
-+	} else
-+		printk(BIOS_DEBUG, "EDID is null, using 640 x 480 @ 60Hz mode");
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 16; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(
-+						BASE_FREQUENCY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < err_most) {
-+						err_most = this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (err_most == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+	       BASE_FREQUENCY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2)) /
-+		(pixel_n + 2) / (pixel_p1 * 10));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0),PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			hactive * vactive * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
- }
- 
- static void native_init(struct device *dev)
- {
-+	struct resource *lfb_res;
-+	struct resource *pio_res;
-+	u32 physbase;
- 	struct resource *gtt_res = find_resource(dev, PCI_BASE_ADDRESS_0);
- 	struct northbridge_intel_x4x_config *conf = dev->chip_info;
- 
-+	lfb_res = find_resource(dev, PCI_BASE_ADDRESS_2);
-+	pio_res = find_resource(dev, PCI_BASE_ADDRESS_4);
-+	physbase = pci_read_config32(dev, 0x5c) & ~0xf;
-+
- 	if (gtt_res && gtt_res->base) {
- 		printk(BIOS_SPEW,
- 			"Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			gtt_res->base);
--		intel_gma_init(conf, res2mmio(gtt_res, 0, 0));
-+		intel_gma_init(conf, res2mmio(gtt_res, 0, 0),
-+			physbase, pio_res->base, lfb_res->base);
- 	}
- 
- 	/* Linux relies on VBT for panel info.  */
-@@ -182,6 +377,7 @@ static void native_init(struct device *dev)
- 
- static void gma_func0_init(struct device *dev)
- {
-+	u16 reg16;
- 	u32 reg32;
- 
- 	/* IGD needs to be Bus Master */
-@@ -189,6 +385,12 @@ static void gma_func0_init(struct device *dev)
- 	reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
- 	pci_write_config32(dev, PCI_COMMAND, reg32);
- 
-+	/* configure GMBUSFREQ */
-+	reg16 = pci_read_config16(dev_find_slot(0, PCI_DEVFN(0x2,0)), 0xcc);
-+	reg16 &= ~0x1ff;
-+	reg16 |= 0xbc;
-+	pci_write_config16(dev_find_slot(0, PCI_DEVFN(0x2,0)), 0xcc, reg16);
-+
- 	if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT))
- 		native_init(dev);
- 	else
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/grub/ga-g41m-es2l/0002-gigabyte-ga-g41m-es2l-add-VESA-mode-to-Kconfig.patch b/resources/libreboot/patch/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/grub/ga-g41m-es2l/0002-gigabyte-ga-g41m-es2l-add-VESA-mode-to-Kconfig.patch
deleted file mode 100644
index d579df55..00000000
--- a/resources/libreboot/patch/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/grub/ga-g41m-es2l/0002-gigabyte-ga-g41m-es2l-add-VESA-mode-to-Kconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f9a84edfc672424c9dcaa0a71ad0751c2355c3d0 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 5 Sep 2016 12:07:57 +0200
-Subject: [PATCH 2/2] gigabyte/ga-g41m-es2l: add VESA mode to Kconfig
-
-This patch adds MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG to the
-gigabyte/ga-g41m-es2l Kconfig to allow selecting between textmode and
-vesamode in menuconfig.
-
-Change-Id: I84b61118fa0419d49d2498b66029711cdce97576
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/mainboard/gigabyte/ga-g41m-es2l/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
-index 6452f4d..281d498 100644
---- a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
-+++ b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
-@@ -26,6 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
- 	select BOARD_ROMSIZE_KB_1024
- 	select INTEL_EDID
- 	select MAINBOARD_HAS_NATIVE_VGA_INIT
-+	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
- 	select PCIEXP_ASPM
- 	select PCIEXP_CLK_PM
- 	select PCIEXP_L1_SUB_STATE
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/reused.list
index 451d1b75..145d6c30 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_16mb/reused.list
@@ -4,4 +4,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-make-256M-vram-the-default-for-gm45-laptops.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-hardcode-use-on-intel-integrated-graphic-device-on-t.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/reused.list
index 59e0a36a..30301d55 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_4mb/reused.list
@@ -4,4 +4,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-make-256M-vram-the-default-for-gm45-laptops.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-hardcode-use-on-intel-integrated-graphic-device-on-t.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/reused.list
index 59e0a36a..30301d55 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/r400_8mb/reused.list
@@ -4,4 +4,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-make-256M-vram-the-default-for-gm45-laptops.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-hardcode-use-on-intel-integrated-graphic-device-on-t.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/reused.list
index 59e0a36a..30301d55 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_16mb/reused.list
@@ -4,4 +4,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-make-256M-vram-the-default-for-gm45-laptops.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-hardcode-use-on-intel-integrated-graphic-device-on-t.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/reused.list
index 59e0a36a..30301d55 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_4mb/reused.list
@@ -4,4 +4,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-make-256M-vram-the-default-for-gm45-laptops.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-hardcode-use-on-intel-integrated-graphic-device-on-t.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/reused.list
index 4ea9a7ad..0ed8edc9 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/reused.list
@@ -1,4 +1,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-add-acpi-c3-cpu-c4-state-for-gm45-thinpads.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/reused.list
index 59e0a36a..30301d55 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_16mb/reused.list
@@ -4,4 +4,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-make-256M-vram-the-default-for-gm45-laptops.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-hardcode-use-on-intel-integrated-graphic-device-on-t.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/reused.list
index 59e0a36a..30301d55 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_4mb/reused.list
@@ -4,4 +4,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-make-256M-vram-the-default-for-gm45-laptops.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-hardcode-use-on-intel-integrated-graphic-device-on-t.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/reused.list
index 59e0a36a..30301d55 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t500_8mb/reused.list
@@ -4,4 +4,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0002-make-256M-vram-the-default-for-gm45-laptops.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/t400_8mb/0003-hardcode-use-on-intel-integrated-graphic-device-on-t.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/reused.list
index 8a98e98c..71fc4dfc 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_16mb/reused.list
@@ -2,4 +2,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-add-acpi-c3-cpu-c4-state-for-gm45-thinpads.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-set-default-vram-to-256M.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/reused.list b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/reused.list
index 8a98e98c..71fc4dfc 100644
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/reused.list
+++ b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_4mb/reused.list
@@ -2,4 +2,3 @@
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-add-acpi-c3-cpu-c4-state-for-gm45-thinpads.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-set-default-vram-to-256M.patch
 /resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-gm45-gma.c-clean-up-some-registers.patch
-/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
deleted file mode 100644
index d89e4884..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0001-nb-intel-gm45-Fix-IOMMU.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0821d0290e7e17e375ffdb48a86b56504db4f77e Mon Sep 17 00:00:00 2001
-From: Damien Zammit <damien@zamaudio.com>
-Date: Sat, 27 Aug 2016 00:35:48 +1000
-Subject: [PATCH] nb/intel/gm45: Fix IOMMU
-
-Previously the ME was being reported as present in ACPI
-even when it's firmware was missing.  Now we do a check via the pci device
-(HECI) to verify if the ME is there or not.
-
-Note that this test could fail if ME is present but disabled in devicetree,
-but in that case you won't see it in the lspci tree anyway so it shouldn't
-be an issue.
-
-Change-Id: Ib692d476d85236b4886ecf3d6e6814229f441de0
-Signed-off-by: Damien Zammit <damien@zamaudio.com>
----
- src/northbridge/intel/gm45/acpi.c  | 3 ++-
- src/northbridge/intel/gm45/iommu.c | 2 ++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
-index 8990c3b..b90afca 100644
---- a/src/northbridge/intel/gm45/acpi.c
-+++ b/src/northbridge/intel/gm45/acpi.c
-@@ -72,7 +72,8 @@ unsigned long acpi_fill_mcfg(unsigned long current)
- 
- static unsigned long acpi_fill_dmar(unsigned long current)
- {
--	int me_active = (dev_find_slot(0, PCI_DEVFN(3, 0)) != NULL);
-+	int me_active = (dev_find_slot(0, PCI_DEVFN(3, 0)) != NULL) &&
-+		(pci_read_config8(dev_find_slot(0, PCI_DEVFN(3, 0)), PCI_CLASS_REVISION) != 0xff);
- 	int stepping = pci_read_config8(dev_find_slot(0, PCI_DEVFN(0, 0)), PCI_CLASS_REVISION);
- 
- 	unsigned long tmp = current;
-diff --git a/src/northbridge/intel/gm45/iommu.c b/src/northbridge/intel/gm45/iommu.c
-index 10548f4..0c3c18e 100644
---- a/src/northbridge/intel/gm45/iommu.c
-+++ b/src/northbridge/intel/gm45/iommu.c
-@@ -40,6 +40,8 @@ void init_iommu()
- 	}
- 	if (me_active) {
- 		MCHBAR32(0x10) = IOMMU_BASE3 | 1; /* ME  @ 0:3.0-3 */
-+	} else {
-+		MCHBAR32(0x10) = 0; /* disable IOMMU for ME */
- 	}
- 	MCHBAR32(0x20) = IOMMU_BASE4 | 1; /* all other DMA sources */
- 
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
deleted file mode 100644
index 26632b7d..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0002-gm45-gma.c-use-screen-on-vga-connector-if-connected.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 51dc727c71bbb10519a670b83b67a84f704e003a Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Mon, 22 Aug 2016 17:58:46 +0200
-Subject: [PATCH 1/2] gm45/gma.c: use screen on vga connector if connected
-
-The intel x4x and gm45 have very similar integrated graphic devices.
-Currently the x4x native graphic init enables VGA, while gm45 can output
-on LVDS.
-
-This patch reuses the x4x graphic initialisation code
-to enable output on VGA in gm45 in a way that the behavior is similar to vbios:
-If no VGA display is connected the internal LVDS screen is used.
-If an external screen is detected on the VGA port it will be used instead.
-
-Change-Id: I7e9ff793a5384ad8b4220fb1c0d9b28e6cee8391
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 157 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 153 insertions(+), 4 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..74c9bc3 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -47,7 +47,7 @@ void gtt_write(u32 reg, u32 data)
- 	write32(res2mmio(gtt_res, reg, 0), data);
- }
- 
--static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
-+static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- 			   u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
-@@ -101,7 +101,7 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 		    sizeof(edid_data), &edid);
- 	mode = &edid.mode;
- 
--	/* Disable screen memory to prevent garbage from appearing.  */
-+	/* Disable screen memory to prevent garbage from appearing. */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
- 	hactive = edid.x_resolution;
-@@ -344,6 +344,152 @@ static void intel_gma_init(const struct northbridge_intel_gm45_config *info,
- 	}
- }
- 
-+static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
-+			   u8 *mmio)
-+{
-+
-+	int i;
-+	u32 hactive, vactive;
-+
-+	vga_gr_write(0x18, 0);
-+
-+	write32(mmio + VGA0, 0x31108);
-+	write32(mmio + VGA1, 0x31406);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + 0x7041c, 0x0);
-+	write32(mmio + DPLL_MD(0), 0x3);
-+	write32(mmio + DPLL_MD(1), 0x3);
-+
-+	vga_misc_write(0x67);
-+
-+	const u8 cr[] = { 0x5f, 0x4f, 0x50, 0x82, 0x55, 0x81, 0xbf, 0x1f,
-+		    0x00, 0x4f, 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
-+		    0x9c, 0x8e, 0x8f, 0x28, 0x1f, 0x96, 0xb9, 0xa3,
-+		    0xff
-+	};
-+	vga_cr_write(0x11, 0);
-+
-+	for (i = 0; i <= 0x18; i++)
-+		vga_cr_write(i, cr[i]);
-+
-+	/* Disable screen memory to prevent garbage from appearing.  */
-+	vga_sr_write(1, vga_sr_read(1) | 0x20);
-+
-+	hactive = 640;
-+	vactive = 400;
-+
-+	mdelay(1);
-+	write32(mmio + FP0(0), 0x31108);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+	mdelay(1);
-+	write32(mmio + DPLL(0),
-+		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
-+		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
-+		| 0x10601
-+		);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	write32(mmio + HTOTAL(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HBLANK(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+	write32(mmio + HSYNC(0),
-+		((hactive - 1) << 16)
-+		| (hactive - 1));
-+
-+	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+		| (vactive - 1));
-+	write32(mmio + VSYNC(0),
-+		((vactive - 1) << 16)
-+		| (vactive - 1));
-+
-+	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
-+
-+	write32(mmio + PF_WIN_POS(0), 0);
-+
-+	write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+
-+	mdelay(1);
-+
-+	write32(mmio + 0x000f000c, 0x00002040);
-+	mdelay(1);
-+	write32(mmio + 0x000f000c, 0x00002050);
-+	write32(mmio + 0x00060100, 0x00044000);
-+	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
-+			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
-+
-+	write32(mmio + VGACNTRL, 0x0);
-+	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
-+	mdelay(1);
-+
-+	write32(mmio + ADPA, ADPA_DAC_ENABLE
-+			| ADPA_PIPE_A_SELECT
-+			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
-+			| ADPA_CRT_HOTPLUG_ENABLE
-+			| ADPA_USE_VGA_HVPOLARITY
-+			| ADPA_VSYNC_CNTL_ENABLE
-+			| ADPA_HSYNC_CNTL_ENABLE
-+			| ADPA_DPMS_ON
-+			);
-+
-+	vga_textmode_init();
-+
-+	/* Enable screen memory.  */
-+	vga_sr_write(1, vga_sr_read(1) & ~0x20);
-+
-+	/* Clear interrupts. */
-+	write32(mmio + DEIIR, 0xffffffff);
-+	write32(mmio + SDEIIR, 0xffffffff);
-+}
-+
-+/* compare the header of the vga edid header */
-+/* if vga is not connected it should not have a correct header */
-+static u8 vga_connected(u8 *mmio)
-+{
-+	u8 vga_edid[128];
-+	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	for (int i = 0; i < 8; i++) {
-+		if (vga_edid[i] != header[i]) {
-+			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-+			return 0;
-+		}
-+	}
-+	printk(BIOS_SPEW, "VGA display connected\n");
-+	return 1;
-+}
-+
- static void gma_pm_init_post_vbios(struct device *const dev)
- {
- 	const struct northbridge_intel_gm45_config *const conf = dev->chip_info;
-@@ -419,8 +565,11 @@ static void gma_func0_init(struct device *dev)
- 			printk(BIOS_SPEW,
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
--			intel_gma_init(conf, res2mmio(gtt_res, 0, 0), physbase,
--				       pio_res->base, lfb_res->base);
-+			if (vga_connected(res2mmio(gtt_res, 0, 0)))
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+			else
-+				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 		}
- 
- 		/* Linux relies on VBT for panel info.  */
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
deleted file mode 100644
index ef42f3e8..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0003-nb-gm45-gma.c-enable-VESA-framebuffer-mode-on-VGA-ou.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 44423cb3e0118b04739f89409e71a0ed1622ccd2 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sat, 27 Aug 2016 01:09:19 +0200
-Subject: [PATCH 2/2] nb/gm45/gma.c: enable VESA framebuffer mode on VGA output
-
-This implements "Keep VESA framebuffer" behavior on VGA output of gm45.
-This patch reuses Linux code to compute vga divisors.
-
-Change-Id: I2db5dd9bb1a7e309ca763b1559b89f7f5c8e6d3d
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 251 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 209 insertions(+), 42 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index 74c9bc3..efaa210 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -25,6 +25,7 @@
- #include <cpu/x86/msr.h>
- #include <cpu/x86/mtrr.h>
- #include <kconfig.h>
-+#include <commonlib/helpers.h>
- 
- #include "drivers/intel/gma/i915_reg.h"
- #include "chip.h"
-@@ -35,6 +36,8 @@
- #include <pc80/vga.h>
- #include <pc80/vga_io.h>
- 
-+#define BASE_FREQUECY 96000
-+
- static struct resource *gtt_res = NULL;
- 
- u32 gtt_read(u32 reg)
-@@ -345,14 +348,38 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info,
- }
- 
- static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
--			   u8 *mmio)
-+			 u8 *mmio, u32 physbase, u16 piobase, u32 lfb)
- {
- 
- 	int i;
--	u32 hactive, vactive;
-+	u8 edid_data[128];
-+	struct edid edid;
-+	struct edid_mode *mode;
-+	u32 hactive, vactive, right_border, bottom_border;
-+	int hpolarity, vpolarity;
-+	u32 vsync, hsync, vblank, hblank, hfront_porch, vfront_porch;
-+	u32 target_frequency;
-+	u32 smallest_err = 0xffffffff;
-+	u32 pixel_p1 = 1;
-+	u32 pixel_n = 1;
-+	u32 pixel_m1 = 1;
-+	u32 pixel_m2 = 1;
-+	u32 link_frequency = info->gfx.link_frequency_270_mhz ? 270000 : 162000;
-+	u32 data_m1;
-+	u32 data_n1 = 0x00800000;
-+	u32 link_m1;
-+	u32 link_n1 = 0x00040000;
-+
- 
- 	vga_gr_write(0x18, 0);
- 
-+	/* Setup GTT.  */
-+	for (i = 0; i < 0x2000; i++) {
-+		outl((i << 2) | 1, piobase);
-+		outl(physbase + (i << 12) + 1, piobase + 4);
-+	}
-+
-+
- 	write32(mmio + VGA0, 0x31108);
- 	write32(mmio + VGA1, 0x31406);
- 
-@@ -363,8 +390,7 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
--			| ADPA_DPMS_ON
--			);
-+			| ADPA_DPMS_ON);
- 
- 	write32(mmio + 0x7041c, 0x0);
- 	write32(mmio + DPLL_MD(0), 0x3);
-@@ -382,95 +408,234 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info,
- 	for (i = 0; i <= 0x18; i++)
- 		vga_cr_write(i, cr[i]);
- 
-+	udelay(1);
-+
-+	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
-+	decode_edid(edid_data,
-+		    sizeof(edid_data), &edid);
-+	mode = &edid.mode;
-+
-+
- 	/* Disable screen memory to prevent garbage from appearing.  */
- 	vga_sr_write(1, vga_sr_read(1) | 0x20);
- 
--	hactive = 640;
--	vactive = 400;
-+	hactive = edid.x_resolution;
-+	vactive = edid.y_resolution;
-+	right_border = mode->hborder;
-+	bottom_border = mode->vborder;
-+	hpolarity = (mode->phsync == '-');
-+	vpolarity = (mode->pvsync == '-');
-+	vsync = mode->vspw;
-+	hsync = mode->hspw;
-+	vblank = mode->vbl;
-+	hblank = mode->hbl;
-+	hfront_porch = mode->hso;
-+	vfront_porch = mode->vso;
-+	target_frequency = mode->pixel_clock;
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		vga_sr_write(1, 1);
-+		vga_sr_write(0x2, 0xf);
-+		vga_sr_write(0x3, 0x0);
-+		vga_sr_write(0x4, 0xe);
-+		vga_gr_write(0, 0x0);
-+		vga_gr_write(1, 0x0);
-+		vga_gr_write(2, 0x0);
-+		vga_gr_write(3, 0x0);
-+		vga_gr_write(4, 0x0);
-+		vga_gr_write(5, 0x0);
-+		vga_gr_write(6, 0x5);
-+		vga_gr_write(7, 0xf);
-+		vga_gr_write(0x10, 0x1);
-+		vga_gr_write(0x11, 0);
-+
-+		edid.bytes_per_line = (edid.bytes_per_line + 63) & ~63;
-+
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		write32(mmio + DSPADDR(0), 0);
-+		write32(mmio + DSPSTRIDE(0), edid.bytes_per_line);
-+		write32(mmio + DSPSURF(0), 0);
-+		for (i = 0; i < 0x100; i++)
-+			write32(mmio + LGC_PALETTE(0) + 4 * i, i * 0x010101);
-+	} else {
-+		vga_textmode_init();
-+	}
-+
-+	u32 candn, candm1, candm2, candp1;
-+	for (candn = 1; candn <= 4; candn++) {
-+		for (candm1 = 23; candm1 >= 17; candm1--) {
-+			for (candm2 = 11; candm2 >= 5; candm2--) {
-+				for (candp1 = 8; candp1 >= 1; candp1--) {
-+					u32 m = 5 * (candm1 + 2) + (candm2 + 2);
-+					u32 p = candp1 * 10; /* 10 == p2 */
-+					u32 vco = DIV_ROUND_CLOSEST(BASE_FREQUECY * m, candn + 2);
-+					u32 dot = DIV_ROUND_CLOSEST(vco, p);
-+					u32 this_err = ABS(dot - target_frequency);
-+					if (this_err < smallest_err) {
-+						smallest_err= this_err;
-+						pixel_n = candn;
-+						pixel_m1 = candm1;
-+						pixel_m2 = candm2;
-+						pixel_p1 = candp1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+
-+	if (smallest_err == 0xffffffff) {
-+		printk(BIOS_ERR, "Couldn't find GFX clock divisors\n");
-+		return;
-+	}
-+
-+	link_m1 = ((uint64_t)link_n1 * mode->pixel_clock) / link_frequency;
-+	data_m1 = ((uint64_t)data_n1 * 18 * mode->pixel_clock)
-+		/ (link_frequency * 8 * 4);
-+
-+	printk(BIOS_INFO, "bringing up panel at resolution %d x %d\n",
-+	       hactive, vactive);
-+	printk(BIOS_DEBUG, "Borders %d x %d\n",
-+	       right_border, bottom_border);
-+	printk(BIOS_DEBUG, "Blank %d x %d\n",
-+	       hblank, vblank);
-+	printk(BIOS_DEBUG, "Sync %d x %d\n",
-+	       hsync, vsync);
-+	printk(BIOS_DEBUG, "Front porch %d x %d\n",
-+	       hfront_porch, vfront_porch);
-+	printk(BIOS_DEBUG, (info->gfx.use_spread_spectrum_clock
-+			    ? "Spread spectrum clock\n" : "DREF clock\n"));
-+	printk(BIOS_DEBUG, "Polarities %d, %d\n",
-+	       hpolarity, vpolarity);
-+	printk(BIOS_DEBUG, "Data M1=%d, N1=%d\n",
-+	       data_m1, data_n1);
-+	printk(BIOS_DEBUG, "Link frequency %d kHz\n",
-+	       link_frequency);
-+	printk(BIOS_DEBUG, "Link M1=%d, N1=%d\n",
-+	       link_m1, link_n1);
-+	printk(BIOS_DEBUG, "Pixel N=%d, M1=%d, M2=%d, P1=%d\n",
-+	       pixel_n, pixel_m1, pixel_m2, pixel_p1);
-+	printk(BIOS_DEBUG, "Pixel clock %d kHz\n",
-+		BASE_FREQUECY * (5 * (pixel_m1 + 2) + (pixel_m2 + 2) / (pixel_n + 2)
-+		/ (pixel_p1 * 10)));
- 
- 	mdelay(1);
--	write32(mmio + FP0(0), 0x31108);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + FP0(0), (pixel_n << 16)
-+		| (pixel_m1 << 8) | pixel_m2);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
-+
- 	mdelay(1);
--	write32(mmio + DPLL(0),
--		DPLL_VCO_ENABLE | DPLLB_MODE_DAC_SERIAL
--		| DPLL_DAC_SERIAL_P2_CLOCK_DIV_10
--		| 0x10601
--		);
-+	write32(mmio + DPLL(0), DPLL_VCO_ENABLE
-+		| DPLL_VGA_MODE_DIS | DPLLB_MODE_DAC_SERIAL
-+		| (0x10000 << (pixel_p1 - 1))
-+		| (6 << 9));
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
- 	write32(mmio + HTOTAL(0),
--		((hactive - 1) << 16)
-+		((hactive + right_border + hblank - 1) << 16)
- 		| (hactive - 1));
- 	write32(mmio + HBLANK(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hblank - 1) << 16)
-+		| (hactive + right_border - 1));
- 	write32(mmio + HSYNC(0),
--		((hactive - 1) << 16)
--		| (hactive - 1));
-+		((hactive + right_border + hfront_porch + hsync - 1) << 16)
-+		| (hactive + right_border + hfront_porch - 1));
- 
--	write32(mmio + VTOTAL(0), ((vactive - 1) << 16)
--		| (vactive - 1));
--	write32(mmio + VBLANK(0), ((vactive - 1) << 16)
-+	write32(mmio + VTOTAL(0), ((vactive + bottom_border + vblank - 1) << 16)
- 		| (vactive - 1));
-+	write32(mmio + VBLANK(0), ((vactive + bottom_border + vblank - 1) << 16)
-+		| (vactive + bottom_border - 1));
- 	write32(mmio + VSYNC(0),
--		((vactive - 1) << 16)
--		| (vactive - 1));
-+		((vactive + bottom_border + vfront_porch + vsync - 1) << 16)
-+		| (vactive + bottom_border + vfront_porch - 1));
- 
- 	write32(mmio + PIPECONF(0), PIPECONF_DISABLE);
- 
- 	write32(mmio + PF_WIN_POS(0), 0);
--
--	write32(mmio + PIPESRC(0), (639 << 16) | 399);
--	write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
--	write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
--	write32(mmio + PFIT_CONTROL, 0xa0000000);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + PIPESRC(0), ((hactive - 1) << 16)
-+			| (vactive - 1));
-+		write32(mmio + PF_CTL(0), 0);
-+		write32(mmio + PF_WIN_SZ(0), 0);
-+		write32(mmio + PFIT_CONTROL, 0);
-+	} else {
-+		write32(mmio + PIPESRC(0), (639 << 16) | 399);
-+		write32(mmio + PF_CTL(0), PF_ENABLE | PF_FILTER_MED_3x3);
-+		write32(mmio + PF_WIN_SZ(0), vactive | (hactive << 16));
-+		write32(mmio + PFIT_CONTROL, 0x80000000);
-+	}
- 
- 	mdelay(1);
- 
-+	write32(mmio + PIPE_DATA_M1(0), 0x7e000000 | data_m1);
-+	write32(mmio + PIPE_DATA_N1(0), data_n1);
-+	write32(mmio + PIPE_LINK_M1(0), link_m1);
-+	write32(mmio + PIPE_LINK_N1(0), link_n1);
-+
- 	write32(mmio + 0x000f000c, 0x00002040);
- 	mdelay(1);
- 	write32(mmio + 0x000f000c, 0x00002050);
- 	write32(mmio + 0x00060100, 0x00044000);
- 	mdelay(1);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6);
-+	write32(mmio + 0x000f0008, 0x00000040);
-+	write32(mmio + 0x000f000c, 0x00022050);
-+	write32(mmio + PIPECONF(0), PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 	write32(mmio + PIPECONF(0), PIPECONF_ENABLE
- 			| PIPECONF_BPP_6 | PIPECONF_DITHER_EN);
- 
--	write32(mmio + VGACNTRL, 0x0);
--	write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE | DISPPLANE_BGRX888);
--	mdelay(1);
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		write32(mmio + VGACNTRL, VGA_DISP_DISABLE);
-+		write32(mmio + DSPCNTR(0), DISPLAY_PLANE_ENABLE
-+			| DISPPLANE_BGRX888);
-+		mdelay(1);
-+	} else {
-+		write32(mmio + VGACNTRL, 0xc4008e);
-+	}
- 
- 	write32(mmio + ADPA, ADPA_DAC_ENABLE
- 			| ADPA_PIPE_A_SELECT
- 			| ADPA_CRT_HOTPLUG_MONITOR_COLOR
- 			| ADPA_CRT_HOTPLUG_ENABLE
--			| ADPA_USE_VGA_HVPOLARITY
- 			| ADPA_VSYNC_CNTL_ENABLE
- 			| ADPA_HSYNC_CNTL_ENABLE
- 			| ADPA_DPMS_ON
--			);
-+			| (vpolarity ? ADPA_VSYNC_ACTIVE_LOW :
-+			   ADPA_VSYNC_ACTIVE_HIGH)
-+			| (hpolarity ? ADPA_HSYNC_ACTIVE_LOW :
-+			   ADPA_HSYNC_ACTIVE_HIGH));
- 
--	vga_textmode_init();
-+	write32(mmio + PP_CONTROL, PANEL_POWER_ON | PANEL_POWER_RESET);
- 
--	/* Enable screen memory.  */
-+	/* Enable screen memory. */
- 	vga_sr_write(1, vga_sr_read(1) & ~0x20);
- 
- 	/* Clear interrupts. */
- 	write32(mmio + DEIIR, 0xffffffff);
- 	write32(mmio + SDEIIR, 0xffffffff);
-+
-+	if (IS_ENABLED(CONFIG_FRAMEBUFFER_KEEP_VESA_MODE)) {
-+		memset((void *) lfb, 0,
-+			edid.x_resolution * edid.y_resolution * 4);
-+		set_vbe_mode_info_valid(&edid, lfb);
-+	}
-+
-+
- }
- 
- /* compare the header of the vga edid header */
-@@ -480,6 +645,7 @@ static u8 vga_connected(u8 *mmio)
- 	u8 vga_edid[128];
- 	u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 	intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128);
-+	intel_gmbus_stop(mmio + GMBUS0);
- 	for (int i = 0; i < 8; i++) {
- 		if (vga_edid[i] != header[i]) {
- 			printk(BIOS_DEBUG, "VGA not connected. Using LVDS display\n");
-@@ -566,7 +732,8 @@ static void gma_func0_init(struct device *dev)
- 			       "Initializing VGA without OPROM. MMIO 0x%llx\n",
- 			       gtt_res->base);
- 			if (vga_connected(res2mmio(gtt_res, 0, 0)))
--				gma_init_vga(conf, res2mmio(gtt_res, 0, 0));
-+				gma_init_vga(conf, res2mmio(gtt_res, 0, 0),
-+					physbase, pio_res->base, lfb_res->base);
- 			else
- 				gma_init_lvds(conf, res2mmio(gtt_res, 0, 0),
- 					physbase, pio_res->base, lfb_res->base);
--- 
-2.9.3
-
diff --git a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch b/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
deleted file mode 100644
index fb30c4c2..00000000
--- a/resources/libreboot/patch/coreboot/d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4/grub/x200_8mb/0004-gm45-gma.c-use-correct-id-string-for-fake-VBT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d7fe366539f2a492b4a64030618506690bfbb232 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Thu, 8 Sep 2016 22:21:54 +0200
-Subject: [PATCH] gm45/gma.c: use correct id string for fake VBT
-
-The correct id string for gm45 is "$VBT CANTIGA        ".
-This can be found in the gm45 option rom:
-"strings vbios.bin | grep VBT".
-
-Change-Id: Icd67a87dac774b4b3c211511c784c4fb4e2ea97c
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
----
- src/northbridge/intel/gm45/gma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
-index d5f6471..19bd944 100644
---- a/src/northbridge/intel/gm45/gma.c
-+++ b/src/northbridge/intel/gm45/gma.c
-@@ -425,7 +425,7 @@ static void gma_func0_init(struct device *dev)
- 
- 		/* Linux relies on VBT for panel info.  */
- 		generate_fake_intel_oprom(&conf->gfx, dev,
--					  "$VBT IRONLAKE-MOBILE");
-+					  "$VBT CANTIGA        ");
- 	}
- }
- 
--- 
-2.9.3
-
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper
index c91be0bf..26d69f0b 100755
--- a/resources/scripts/helpers/build/roms/withgrub_helper
+++ b/resources/scripts/helpers/build/roms/withgrub_helper
@@ -88,7 +88,7 @@ fi
 
 for romtype in txtmode vesafb
 do
-	if [ "${boardtarget}" = "kgpe-d16" ] || [ "${boardtarget}" = "kcma-d8" ] || [ "${boardtarget}" = "d510mo" ]; then
+	if [ "${boardtarget}" = "kgpe-d16" ] || [ "${boardtarget}" = "ga-g41m-es2l" ] || [ "${boardtarget}" = "kcma-d8" ] || [ "${boardtarget}" = "d510mo" ]; then
 		if [ "${romtype}" = "vesafb" ]; then
 			printf "Only text-mode is reported to work on KGPE-D16, KCMA-D8, D510MO and ga-g41m-es2l\n"
 			printf "TODO: get tpearson to fix it\n"
diff --git a/resources/utilities/coreboot-libre/blobs/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/blobs.list b/resources/utilities/coreboot-libre/blobs/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/blobs.list
deleted file mode 100644
index a8a9a964..00000000
--- a/resources/utilities/coreboot-libre/blobs/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/blobs.list
+++ /dev/null
@@ -1,52 +0,0 @@
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000624_Enc.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch0600050D_Enc.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000425.c
-src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600110F_Enc.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch03000002.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000f.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000e.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
-src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
-src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000b6.c
-src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000098.c
-src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000086.c
-src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
-src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
-src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000029.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000119.c
-src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbSmuFirmware.h
-src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmuFirmware.h
-src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSmuFirmwareKB.h
-src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbSmuFirmwareTN.h
-src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/excel925.h
-src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSamuPatchKB.h
-src/vendorcode/amd/cimx/rd890/HotplugFirmware.h
-src/cpu/dmp/vortex86ex/dmp_kbd_fw_part1.inc
-src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlibSsdt.h
-src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieAlibSsdt.h
-src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibSsdtKB.h
-src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFM2.h
-src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFS1.h
diff --git a/resources/utilities/coreboot-libre/blobs/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/nonblobs.list b/resources/utilities/coreboot-libre/blobs/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/nonblobs.list
deleted file mode 100644
index 6f672156..00000000
--- a/resources/utilities/coreboot-libre/blobs/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/nonblobs.list
+++ /dev/null
@@ -1,335 +0,0 @@
-payloads/libpayload/curses/PDCurses-3.4/demos/worm.c
-payloads/libpayload/curses/PDCurses-3.4/sdl1/deffont.h
-payloads/libpayload/curses/PDCurses-3.4/sdl1/deficon.h
-payloads/libpayload/curses/PDCurses-3.4/win32/pdckbd.c
-payloads/libpayload/curses/PDCurses-3.4/x11/big_icon.xbm
-payloads/libpayload/curses/PDCurses-3.4/x11/little_icon.xbm
-payloads/libpayload/curses/pdcurses-backend/pdcdisp.c
-payloads/libpayload/curses/tinycurses.c
-payloads/libpayload/drivers/keyboard.c
-payloads/libpayload/drivers/usb/usbmsc.c
-payloads/libpayload/tests/cbfs-x86-test.c
-payloads/nvramcui/payload.sh
-src/cpu/allwinner/a10/raminit.c
-src/cpu/amd/geode_gx2/Kconfig
-src/cpu/amd/geode_lx/cpureginit.c
-src/cpu/amd/geode_lx/Kconfig
-src/cpu/amd/model_10xxx/init_cpus.c
-src/cpu/amd/model_10xxx/processor_name.c
-src/cpu/amd/model_fxx/model_fxx_update_microcode.c
-src/cpu/amd/model_fxx/powernow_acpi.c
-src/cpu/intel/haswell/acpi.c
-src/cpu/intel/microcode/microcode.c
-src/cpu/intel/model_2065x/acpi.c
-src/cpu/intel/model_206ax/acpi.c
-src/cpu/Kconfig
-src/cpu/samsung/exynos5250/update-bl1.sh
-src/cpu/via/nano/update_ucode.c
-src/device/dram/spd_cache.c
-src/device/Kconfig
-src/device/oprom/yabel/interrupt.c
-src/drivers/pc80/mc146818rtc.c
-src/drivers/pc80/vga/vga_palette.c
-src/Kconfig
-src/lib/coreboot_table.c
-src/lib/jpeg.c
-src/mainboard/advansus/a785e-i/mptable.c
-src/mainboard/amd/bimini_fam10/mptable.c
-src/mainboard/amd/dinar/buildOpts.c
-src/mainboard/amd/dinar/Kconfig
-src/mainboard/amd/inagua/Kconfig
-src/mainboard/amd/olivehill/mptable.c
-src/mainboard/amd/olivehillplus/mptable.c
-src/mainboard/amd/parmer/mptable.c
-src/mainboard/amd/persimmon/Kconfig
-src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
-src/mainboard/amd/south_station/Kconfig
-src/mainboard/amd/south_station/mptable.c
-src/mainboard/amd/thatcher/mptable.c
-src/mainboard/amd/torpedo/Kconfig
-src/mainboard/amd/torpedo/mptable.c
-src/mainboard/amd/union_station/Kconfig
-src/mainboard/amd/union_station/mptable.c
-src/mainboard/asrock/e350m1/mptable.c
-src/mainboard/asrock/imb-a180/mptable.c
-src/mainboard/asus/f2a85-m/mptable.c
-src/mainboard/asus/m5a88-v/mptable.c
-src/mainboard/avalue/eax-785e/mptable.c
-src/mainboard/digitallogic/adl855pc/irq_tables.c
-src/mainboard/gigabyte/ga-b75m-d3h/romstage.c
-src/mainboard/gizmosphere/gizmo2/Micron_MT41J128M16JT.spd.hex
-src/mainboard/gizmosphere/gizmo/mptable.c
-src/mainboard/google/bolt/romstage.c
-src/mainboard/google/butterfly/hda_verb.c
-src/mainboard/google/butterfly/mainboard.c
-src/mainboard/google/falco/romstage.c
-src/mainboard/google/link/hda_verb.c
-src/mainboard/google/link/i915.c
-src/mainboard/google/link/romstage.c
-src/mainboard/google/panther/lan.c
-src/mainboard/google/peach_pit/mainboard.c
-src/mainboard/google/peppy/romstage.c
-src/mainboard/google/rambi/romstage.c
-src/mainboard/google/samus/romstage.c
-src/mainboard/google/slippy/romstage.c
-src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
-src/mainboard/hp/pavilion_m6_1035dx/mptable.c
-src/mainboard/ibase/mb899/cmos.layout
-src/mainboard/ibase/mb899/superio_hwm.c
-src/mainboard/intel/minnowmax/Kconfig
-src/mainboard/intel/wtm2/i915.c
-src/mainboard/jetway/nf81-t56n-lf/Kconfig
-src/mainboard/kontron/986lcd-m/cmos.layout
-src/mainboard/kontron/986lcd-m/mainboard.c
-src/mainboard/lenovo/g505s/mptable.c
-src/mainboard/lippert/frontrunner-af/Kconfig
-src/mainboard/lippert/frontrunner-af/mptable.c
-src/mainboard/lippert/toucan-af/Kconfig
-src/mainboard/lippert/toucan-af/mptable.c
-src/mainboard/msi/ms9652_fam10/get_bus_conf.c
-src/mainboard/packardbell/ms2290/mainboard.c
-src/mainboard/samsung/lumpy/romstage.c
-src/mainboard/siemens/sitemp_g1p1/cmos.layout
-src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
-src/mainboard/supermicro/h8qgi/buildOpts.c
-src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
-src/mainboard/supermicro/h8scm/buildOpts.c
-src/mainboard/tyan/s2912_fam10/get_bus_conf.c
-src/mainboard/tyan/s4880/irq_tables.c
-src/mainboard/tyan/s4882/irq_tables.c
-src/mainboard/tyan/s8226/buildOpts.c
-src/northbridge/amd/agesa/common/common.c
-src/northbridge/amd/amdk8/acpi.c
-src/northbridge/amd/amdk8/coherent_ht.c
-src/northbridge/amd/amdk8/raminit_test.c
-src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
-src/northbridge/amd/amdmct/mct/mctardk3.c
-src/northbridge/amd/amdmct/mct/mctardk4.c
-src/northbridge/amd/amdmct/mct/mcttmrl.c
-src/northbridge/amd/gx2/pll_reset.c
-src/northbridge/amd/pi/00730F01/Kconfig
-src/northbridge/intel/gm45/raminit_rcomp_calibration.c
-src/northbridge/intel/gm45/raminit_read_write_training.c
-src/northbridge/intel/haswell/Kconfig
-src/northbridge/intel/haswell/raminit.c
-src/northbridge/intel/i82830/vga.c
-src/northbridge/intel/i945/raminit.c
-src/northbridge/intel/nehalem/gma.c
-src/northbridge/intel/nehalem/raminit.c
-src/northbridge/intel/sandybridge/gma.c
-src/northbridge/intel/sandybridge/Kconfig
-src/northbridge/intel/sandybridge/raminit.c
-src/northbridge/via/cx700/raminit.c
-src/northbridge/via/vx800/ide.c
-src/northbridge/via/vx800/uma_ram_setting.c
-src/northbridge/via/vx900/sata.c
-src/soc/intel/baytrail/acpi.c
-src/soc/intel/baytrail/Kconfig
-src/soc/intel/baytrail/romstage/raminit.c
-src/soc/intel/broadwell/acpi.c
-src/soc/intel/broadwell/Kconfig
-src/soc/intel/broadwell/romstage/raminit.c
-src/soc/intel/fsp_baytrail/acpi.c
-src/soc/intel/fsp_baytrail/fsp/Kconfig
-src/soc/intel/fsp_baytrail/Kconfig
-src/soc/qualcomm/ipq806x/Kconfig
-src/soc/samsung/exynos5250/clock.c
-src/soc/samsung/exynos5420/clock.c
-src/southbridge/amd/agesa/hudson/Kconfig
-src/southbridge/amd/cimx/sb800/Kconfig
-src/southbridge/intel/bd82x6x/Kconfig
-src/southbridge/intel/i82801ix/dmi_setup.c
-src/southbridge/intel/ibexpeak/Kconfig
-src/southbridge/intel/lynxpoint/Kconfig
-src/southbridge/intel/sch/Kconfig
-src/southbridge/sis/sis966/early_smbus.c
-src/southbridge/sis/sis966/ide.c
-src/southbridge/sis/sis966/sata.c
-src/southbridge/sis/sis966/usb2.c
-src/southbridge/sis/sis966/usb.c
-src/superio/via/vt1211/vt1211.c
-src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Dmi.c
-src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
-src/vendorcode/amd/agesa/f10/Proc/Mem/Main/muc.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Dmi.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Dmi.c
-src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12WheaInitDataTables.c
-src/vendorcode/amd/agesa/f12/Proc/Fch/Hwm/Family/Hudson2/Hudson2HwmLateService.c
-src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/Family/LN/F12GfxServices.c
-src/vendorcode/amd/agesa/f12/Proc/Mem/Main/muc.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
-src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Dmi.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
-src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c
-src/vendorcode/amd/agesa/f15/Proc/Mem/Main/muc.c
-src/vendorcode/amd/agesa/f15/Proc/Mem/Ps/OR/mpor3.c
-src/vendorcode/amd/agesa/f15/Proc/Mem/Tech/DDR3/mtlrdimm3.c
-src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c
-src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxIntegratedInfoTableTN.c
-src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxLibTN.c
-src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/muc.c
-src/vendorcode/amd/agesa/f15tn/Proc/Mem/Ps/TN/mptn3.c
-src/vendorcode/amd/agesa/f15tn/Proc/Mem/Tech/DDR3/mtlrdimm3.c
-src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16WheaInitDataTables.c
-src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxLibV3.c
-src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbF1TableKB.c
-src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/muc.c
-src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/KB/mpkb3.c
-src/vendorcode/amd/cimx/sb800/SATA.c
-src/vendorcode/google/chromeos/build-snow
-util/amdtools/example_input/lspci-cb-48G-667MHz-18.2-20090909e
-util/amdtools/example_input/lspci-prop-48G-667MHz-18.2
-util/cbfstool/linux_trampoline.c
-util/ifdtool/ifdtool.c
-util/kconfig/zconf.hash.c_shipped
-util/kconfig/zconf.lex.c_shipped
-util/kconfig/zconf.tab.c_shipped
-util/nvramtool/accessors/layout-bin.c
-util/romcc/do_tests.sh
-util/romcc/tests/include/linux_console.h
-util/romcc/tests/linux_console.h
-util/romcc/tests/linux_test5.c
-util/romcc/tests/raminit_test6.c
-util/romcc/tests/raminit_test7.c
-util/romcc/tests/simple_test14.c
-util/romcc/tests/simple_test30.c
-util/romcc/tests/simple_test38.c
-util/romcc/tests/simple_test39.c
-util/romcc/tests/simple_test54.c
-util/romcc/tests/simple_test59.c
-util/romcc/tests/simple_test72.c
-util/romcc/tests/simple_test73.c
-util/sconfig/lex.yy.c_shipped
-util/sconfig/sconfig.tab.c_shipped
-util/superiotool/fintek.c
-util/superiotool/ite.c
-util/superiotool/smsc.c
-util/superiotool/winbond.c
-src/mainboard/google/slippy/Micron_4KTF25664HZ.spd.hex
-src/mainboard/google/falco/Micron_4KTF25664HZ.spd.hex
-src/mainboard/google/peppy/Micron_4KTF25664HZ.spd.hex
-src/mainboard/google/link/micron_4Gb_1600_1.35v_x16.spd.hex
-src/mainboard/google/rambi/spd/micron_1GiB_dimm_MT41K128M16JT-125.spd.hex
-src/mainboard/google/rambi/spd/micron_2GiB_dimm_MT41K256M16HA-125.spd.hex
-src/mainboard/google/bolt/micron_4Gb_1600_1.35v_x16.spd.hex
-src/mainboard/google/link/samsung_4Gb_1600_1.35v_x16.spd.hex
-src/mainboard/google/link/elpida_4Gb_1600_x16.spd.hex
-src/mainboard/google/slippy/Hynix_HMT425S6AFR6A.spd.hex
-src/mainboard/google/falco/Hynix_HMT425S6AFR6A.spd.hex
-src/mainboard/google/falco/Elpida_EDJ4216EFBG.spd.hex
-src/mainboard/google/rambi/spd/hynix_1GiB_dimm_H5TC2G63FFR-PBA.spd.hex
-src/mainboard/google/rambi/spd/hynix_2GiB_dimm_H5TC4G63AFR-PBA.spd.hex
-src/mainboard/google/bolt/samsung_4Gb_1600_1.35v_x16.spd.hex
-src/mainboard/google/bolt/elpida_4Gb_1600_x16.spd.hex
-src/mainboard/google/peppy/Hynix_HMT425S6AFR6A.spd.hex
-src/mainboard/google/peppy/Elpida_EDJ4216EFBG.spd.hex
-src/mainboard/google/falco/Samsung_M471B5674QH0.spd.hex
-src/mainboard/google/samus/spd/empty.spd.hex
-src/mainboard/google/samus/spd/elpida_4.spd.hex
-src/mainboard/google/samus/spd/hynix_4.spd.hex
-src/mainboard/google/samus/spd/elpida_16.spd.hex
-src/mainboard/google/samus/spd/hynix_8.spd.hex
-src/mainboard/google/samus/spd/hynix_16.spd.hex
-src/mainboard/google/samus/spd/samsung_8.spd.hex
-src/mainboard/google/samus/spd/elpida_8.spd.hex
-src/mainboard/google/samus/spd/samsung_4.spd.hex
-src/mainboard/google/auron/spd/Micron_4KTF25664HZ.spd.hex
-src/mainboard/google/auron/spd/Elpida_EDJ4216EFBG.spd.hex
-src/mainboard/google/auron/spd/Hynix_HMT425S6AFR6A.spd.hex
-src/mainboard/google/glados/spd/samsung_dimm_K4E6E304EE-EGCF.spd.hex
-src/mainboard/google/auron/spd/empty.spd.hex
-src/mainboard/google/cyan/spd/hynix_2GiB_dimm_HMT425S6CFR6A_H5TC4G63CFR.spd.hex
-src/mainboard/google/cyan/spd/samsung_2GiB_dimm_K4B4G1646Q-HYK0.spd.hex
-src/mainboard/google/cyan/spd/hynix_2GiB_dimm_H5TC4G63AFR-PBA.spd.hex
-src/mainboard/google/glados/spd/hynix_dimm_H9CCNNNBLTALAR.spd.hex
-src/mainboard/google/glados/spd/empty.spd.hex
-src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8JTBLAR.spd.hex
-src/mainboard/intel/sklrvp/spd/empty.spd.hex
-src/mainboard/intel/sklrvp/spd/rvp3.spd.hex
-src/mainboard/intel/kunimitsu/spd/empty.spd.hex
-src/mainboard/intel/kunimitsu/spd/samsung_dimm_K4E8E304EE-EGCE.spd.hex
-src/mainboard/intel/strago/spd/hynix_2GiB_dimm_HMT425S6CFR6A_H5TC4G63CFR.spd.hex
-src/mainboard/intel/strago/spd/samsung_2GiB_dimm_K4B4G1646Q-HYK0.spd.hex
-src/mainboard/intel/strago/spd/hynix_2GiB_dimm_H5TC4G63AFR-PBA.spd.hex
-src/mainboard/intel/kunimitsu/spd/hynix_dimm_H9CCNNNBLTALAR-NUD-2G-1866.spd.hex
-src/mainboard/intel/kunimitsu/spd/samsung_dimm_K4E8E304EE-EGCF-1G-1866.spd.hex
-src/mainboard/intel/kunimitsu/spd/samsung_dimm_K4E6E304EE-EGCF-2G-1866.spd.hex
-src/mainboard/intel/kunimitsu/spd/hynix_dimm_H9CCNNN8JTALAR-NUD-1G-1866.spd.hex
-src/mainboard/bap/ode_e20XX/BAP_Q7.spd.hex
-src/northbridge/intel/nehalem/raminit_tables.c
-src/northbridge/intel/sandybridge/raminit_patterns.h
-src/southbridge/nvidia/mcp55/early_setup_ss.h
-src/southbridge/nvidia/ck804/early_setup_ss.h
-src/southbridge/sis/sis966/early_setup_ss.h
-util/crossgcc/patches/binutils-2.25_riscv.patch
-src/southbridge/amd/pi/hudson/Kconfig
-src/drivers/xgi/common/vb_setmode.c
-src/drivers/xgi/common/vb_table.h
-src/drivers/xgi/common/XGI_main.h
-src/mainboard/siemens/mc_tcu3/romstage.c
-src/mainboard/siemens/mc_tcu3/lcd_panel.c
-src/mainboard/siemens/mc_tcu3/modhwinfo.c
-src/mainboard/pcengines/apu1/Kconfig
-src/mainboard/asus/kfsn4-dre/get_bus_conf.c
-src/mainboard/google/samus/spd/spd.c
-src/mainboard/hp/abm/mptable.c
-src/northbridge/amd/pi/00630F01/Kconfig
-src/cpu/amd/microcode/microcode.c
-src/lib/tlcl_structures.h
-util/rockchip/make_idb.py
-util/autoport/readme.md
-util/bimgtool/bimgtool.c
-util/cbfstool/fmd_parser.c_shipped
-util/cbfstool/fmd_scanner.c_shipped
-Documentation/CorebootBuildingGuide.tex
-Documentation/hypertransport.svg
-Documentation/codeflow.svg
-src/soc/broadcom/cygnus/ddr_init.c
-src/soc/broadcom/cygnus/ddr_init_table.c
-src/soc/qualcomm/ipq806x/lcc.c
-src/soc/intel/braswell/acpi.c
-src/soc/intel/braswell/Kconfig
-src/vendorcode/amd/pi/Kconfig
-src/drivers/intel/fsp1_1/Kconfig
-src/drivers/intel/fsp1_1/fsp_gop.c
-src/drivers/i2c/ww_ring/ww_ring_programs.c
-src/mainboard/google/auron/spd/spd.c
-src/mainboard/google/jecht/lan.c
-src/mainboard/gigabyte/ga-b75m-d3v/romstage.c
-src/mainboard/amd/lamar/Kconfig
-payloads/external/GRUB2/Kconfig
-payloads/external/FILO/Kconfig
-payloads/external/SeaBIOS/Kconfig
-src/soc/intel/common/fsp_ramstage.c
-src/soc/intel/skylake/Kconfig
-src/soc/intel/braswell/gpio.c
-src/soc/nvidia/tegra210/Kconfig
-src/soc/nvidia/tegra210/mtc.c
-src/southbridge/intel/common/firmware/Kconfig
-src/mainboard/google/cyan/spd/spd.c
-src/mainboard/google/cyan/Kconfig
-src/mainboard/google/glados/spd/spd.c
-src/mainboard/intel/sklrvp/spd/spd.c
-src/mainboard/intel/kunimitsu/spd/spd.c
-src/mainboard/intel/strago/spd/spd.c
-src/mainboard/intel/strago/Kconfig
-src/mainboard/amd/bettong/mptable.c
-src/northbridge/amd/pi/00660F01/Kconfig
-util/crossgcc/patches/gcc-5.2.0_riscv.patch
-util/xcompile/xcompile
-src/northbridge/intel/sandybridge/raminit_mrc.c
-src/northbridge/intel/fsp_rangeley/fsp/Kconfig
-src/drivers/intel/fsp1_1/car.c
-src/mainboard/intel/mohonpeak/Kconfig
-src/mainboard/apple/macbookair4_2/early_southbridge.c
-src/cpu/intel/fsp_model_406dx/acpi.c
-src/northbridge/intel/fsp_sandybridge/fsp/Kconfig
-src/drivers/aspeed/common/ast_dram_tables.h
-src/drivers/aspeed/common/ast_tables.h
-src/mainboard/intel/cougar_canyon2/Kconfig
-src/cpu/amd/family_10h-family_15h/processor_name.c
-src/cpu/amd/family_10h-family_15h/init_cpus.c
-src/cpu/intel/fsp_model_206ax/acpi.c
diff --git a/resources/utilities/coreboot-libre/blobs/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/nonblobs_notes b/resources/utilities/coreboot-libre/blobs/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/nonblobs_notes
deleted file mode 100644
index 551da4a8..00000000
--- a/resources/utilities/coreboot-libre/blobs/coreboot/55a54f662e2e793306dc7003afbcb82b49db0a8c/nonblobs_notes
+++ /dev/null
@@ -1,15 +0,0 @@
-.spd.hex files - serial presence detect. These are not blobs
-see JEDEC standard or https://en.wikipedia.org/wiki/Serial_presence_detect
-These are added to the nonblobs file
-
-src/northbridge/intel/nehalem/raminit_tables.c"
-src/northbridge/intel/sandybridge/raminit_patterns.h
-These are used by native raminit for the relevant platforms, and are not blobs
-
-"src/southbridge/nvidia/mcp55/early_setup_ss.h" \
-"src/southbridge/nvidia/ck804/early_setup_ss.h" \
-"src/southbridge/sis/sis966/early_setup_ss.h"
-not blobs
-
-The text in this file is CC-BY-SA 4.0 or higher. All contributions to it must
-be made under the same license.