i945 and gm45 laptops: use cb 2a3434757ef425dbdfedf1fc69e1a033a6e7310d

This should fix the RTC century byte issue (fix merged upstream).
Some patches were removed, in those cases where they became merged upstream.

23 files changed, 0 insertions, 683 deletions

diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_4mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_4mb/reused.list
deleted file mode 100644
index fe69c350..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_4mb/reused.list
+++ /dev/null
@@ -1,4 +0,0 @@
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/0001-lenovo-r400-Add-clone-of-Lenovo-T400.patch
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/0001-lenovo-r400-Add-clone-of-Lenovo-T400.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/0001-lenovo-r400-Add-clone-of-Lenovo-T400.patch
deleted file mode 100644
index 8e4f61ae..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/0001-lenovo-r400-Add-clone-of-Lenovo-T400.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 199e542660a3a9947051485fa1b5b8f6e2fd6495 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= <mtjm@mtjm.eu>
-Date: Tue, 3 Feb 2015 23:26:05 +0100
-Subject: [PATCH 7/9] lenovo/r400: Add clone of Lenovo T400
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The existing code for the Lenovo T400 works without changes on the
-Lenovo R400.  Same HDA verbs are provided by Lenovo BIOS on both
-laptops.
-
-Change-Id: I1dadddd7250ab80a4c40c2435865d72e3e5d99c9
-Signed-off-by: Michał Masłowski <mtjm@mtjm.eu>
-Signed-off-by: Francis Rowe <info@gluglug.org.uk>
----
- src/mainboard/lenovo/r400/Kconfig        | 7 +++++++
- src/mainboard/lenovo/r400/Kconfig.name   | 2 ++
- src/mainboard/lenovo/r400/board_info.txt | 6 ++++++
- src/mainboard/lenovo/t400/Kconfig        | 6 +++++-
- 4 files changed, 20 insertions(+), 1 deletion(-)
- create mode 100644 src/mainboard/lenovo/r400/Kconfig
- create mode 100644 src/mainboard/lenovo/r400/Kconfig.name
- create mode 100644 src/mainboard/lenovo/r400/board_info.txt
-
-diff --git a/src/mainboard/lenovo/r400/Kconfig b/src/mainboard/lenovo/r400/Kconfig
-new file mode 100644
-index 0000000..0966bf1
---- /dev/null
-+++ b/src/mainboard/lenovo/r400/Kconfig
-@@ -0,0 +1,7 @@
-+if BOARD_LENOVO_R400
-+
-+config MAINBOARD_PART_NUMBER
-+	string
-+	default "ThinkPad R400"
-+
-+endif
-diff --git a/src/mainboard/lenovo/r400/Kconfig.name b/src/mainboard/lenovo/r400/Kconfig.name
-new file mode 100644
-index 0000000..15a99b1
---- /dev/null
-+++ b/src/mainboard/lenovo/r400/Kconfig.name
-@@ -0,0 +1,2 @@
-+config BOARD_LENOVO_R400
-+	bool "ThinkPad R400"
-diff --git a/src/mainboard/lenovo/r400/board_info.txt b/src/mainboard/lenovo/r400/board_info.txt
-new file mode 100644
-index 0000000..007ec6c
---- /dev/null
-+++ b/src/mainboard/lenovo/r400/board_info.txt
-@@ -0,0 +1,6 @@
-+Category: laptop
-+ROM package: SOIC-16 or SOIC-8
-+ROM protocol: SPI
-+ROM socketed: n
-+Flashrom support: n
-+Clone of: lenovo/t400
-diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
-index e410f20..467cd63 100644
---- a/src/mainboard/lenovo/t400/Kconfig
-+++ b/src/mainboard/lenovo/t400/Kconfig
-@@ -1,4 +1,4 @@
--if BOARD_LENOVO_T400
-+if BOARD_LENOVO_T400 || BOARD_LENOVO_R400
- 
- config BOARD_SPECIFIC_OPTIONS # dummy
- 	def_bool y
-@@ -27,10 +27,14 @@ config MAINBOARD_DIR
- 	string
- 	default lenovo/t400
- 
-+if BOARD_LENOVO_T400
-+
- config MAINBOARD_PART_NUMBER
- 	string
- 	default "ThinkPad T400"
- 
-+endif
-+
- config MMCONF_BASE_ADDRESS
- 	hex
- 	default 0xf0000000
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/INFO b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/INFO
deleted file mode 100644
index ad7d12f4..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/INFO
+++ /dev/null
@@ -1,4 +0,0 @@
-# NOTE: remove this when updating coreboot. This has been merged upstream
-printf "ThinkPad R400 support (clone of the T400)\n"
-git am "../resources/libreboot/patch/misc/0007-lenovo-r400-Add-clone-of-Lenovo-T400.patch"
-# git fetch http://review.coreboot.org/coreboot refs/changes/93/8393/5 && git cherry-pick FETCH_HEAD
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/reused.list
deleted file mode 100644
index 7a1a07b4..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/reused.list
+++ /dev/null
@@ -1,3 +0,0 @@
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_4mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_4mb/reused.list
deleted file mode 100644
index 7a1a07b4..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_4mb/reused.list
+++ /dev/null
@@ -1,3 +0,0 @@
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
deleted file mode 100644
index dae11e45..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From 82d185307ef39c0ee9a95806a2f21679479721b4 Mon Sep 17 00:00:00 2001
-From: Timothy Pearson <tpearson@raptorengineeringinc.com>
-Date: Sun, 5 Apr 2015 18:10:09 -0500
-Subject: [PATCH 1/9] mainboard/lenovo/t400: Add initial hybrid graphics
- support
-
-TEST: Booted T400 with Intel/ATI hybrid graphics in integrated
-mode with native Intel graphics init and verified integrated
-panel framebuffer functionality in SeaBIOS and Linux.
-
-Change-Id: I37e72c5dad0d7ab3915cc3d439ae9a4a9b3787e3
-Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
----
- src/mainboard/lenovo/t400/cmos.default |   1 +
- src/mainboard/lenovo/t400/cmos.layout  |   8 +-
- src/mainboard/lenovo/t400/romstage.c   | 143 +++++++++++++++++++++++++++++++++
- 3 files changed, 151 insertions(+), 1 deletion(-)
-
-diff --git a/src/mainboard/lenovo/t400/cmos.default b/src/mainboard/lenovo/t400/cmos.default
-index 67b8920..06eec57 100644
---- a/src/mainboard/lenovo/t400/cmos.default
-+++ b/src/mainboard/lenovo/t400/cmos.default
-@@ -14,3 +14,4 @@ sticky_fn=Disable
- power_management_beeps=Enable
- low_battery_beep=Enable
- sata_mode=AHCI
-+hybrid_graphics_mode=Integrated Only
-\ No newline at end of file
-diff --git a/src/mainboard/lenovo/t400/cmos.layout b/src/mainboard/lenovo/t400/cmos.layout
-index 2dc91bf..44f5d04 100644
---- a/src/mainboard/lenovo/t400/cmos.layout
-+++ b/src/mainboard/lenovo/t400/cmos.layout
-@@ -85,7 +85,10 @@ entries
- # coreboot config options: northbridge
- 941         3       e       11       gfx_uma_size
- 
--#944          2       r       0        unused
-+# coreboot config options: graphics
-+944         2       e       12       hybrid_graphics_mode
-+
-+#946          2       r       0        unused
- 
- # coreboot config options: check sums
- 984          16       h       0        check_sum
-@@ -137,6 +140,9 @@ enumerations
- 11    3     128M
- 11    5     96M
- 11    6     160M
-+12    0     Integrated Only
-+12    1     Discrete Only
-+12    2     Switchable
- 
- # -----------------------------------------------------------------
- checksums
-diff --git a/src/mainboard/lenovo/t400/romstage.c b/src/mainboard/lenovo/t400/romstage.c
-index a739d18..c62df60 100644
---- a/src/mainboard/lenovo/t400/romstage.c
-+++ b/src/mainboard/lenovo/t400/romstage.c
-@@ -1,6 +1,7 @@
- /*
-  * This file is part of the coreboot project.
-  *
-+ * Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering
-  * Copyright (C) 2012 secunet Security Networks AG
-  *
-  * This program is free software; you can redistribute it and/or
-@@ -37,6 +38,118 @@
- #define LPC_DEV PCI_DEV(0, 0x1f, 0)
- #define MCH_DEV PCI_DEV(0, 0, 0)
- 
-+#define HYBRID_GRAPHICS_INTEGRATED_ONLY 0
-+#define HYBRID_GRAPHICS_DISCRETE_ONLY 1
-+#define HYBRID_GRAPHICS_SWITCHABLE 2
-+
-+#define HYBRID_GRAPHICS_GP_LVL_BITS 0x004a0000
-+#define HYBRID_GRAPHICS_GP_LVL2_BITS 0x00020000
-+
-+#define HYBRID_GRAPHICS_DETECT_GP_BITS 0x00000010
-+
-+#define HYBRID_GRAPHICS_INT_CLAIM_VGA 0x2
-+#define HYBRID_GRAPHICS_SEC_VGA_EN 0x2
-+
-+static void hybrid_graphics_configure_switchable_graphics(bool enable)
-+{
-+	uint32_t tmp;
-+
-+	if (enable) {
-+		/* Disable integrated graphics legacy VGA cycles */
-+		tmp = pci_read_config16(MCH_DEV, D0F0_GGC);
-+		pci_write_config16(MCH_DEV, D0F0_GGC, tmp | HYBRID_GRAPHICS_INT_CLAIM_VGA);
-+
-+		/* Enable secondary VGA controller */
-+		tmp = pci_read_config16(MCH_DEV, D0F0_DEVEN);
-+		pci_write_config16(MCH_DEV, D0F0_DEVEN, tmp | HYBRID_GRAPHICS_SEC_VGA_EN);
-+	}
-+	else {
-+		/* Enable integrated graphics legacy VGA cycles */
-+		tmp = pci_read_config16(MCH_DEV, D0F0_GGC);
-+		pci_write_config16(MCH_DEV, D0F0_GGC, tmp & ~HYBRID_GRAPHICS_INT_CLAIM_VGA);
-+
-+		/* Disable secondary VGA controller */
-+		tmp = pci_read_config16(MCH_DEV, D0F0_DEVEN);
-+		pci_write_config16(MCH_DEV, D0F0_DEVEN, tmp & ~HYBRID_GRAPHICS_SEC_VGA_EN);
-+	}
-+}
-+
-+static void hybrid_graphics_set_up_gpio(void)
-+{
-+	uint32_t tmp;
-+
-+	/* Enable hybrid graphics GPIO lines */
-+	tmp = inl(DEFAULT_GPIOBASE + GP_IO_USE_SEL);
-+	tmp = tmp | HYBRID_GRAPHICS_GP_LVL_BITS;
-+	outl(tmp, DEFAULT_GPIOBASE + GP_IO_USE_SEL);
-+
-+	tmp = inl(DEFAULT_GPIOBASE + GP_IO_USE_SEL2);
-+	tmp = tmp | HYBRID_GRAPHICS_GP_LVL2_BITS;
-+	outl(tmp, DEFAULT_GPIOBASE + GP_IO_USE_SEL2);
-+
-+	/* Set hybrid graphics control GPIO lines to output */
-+	tmp = inl(DEFAULT_GPIOBASE + GP_IO_SEL);
-+	tmp = tmp & ~HYBRID_GRAPHICS_GP_LVL_BITS;
-+	outl(tmp, DEFAULT_GPIOBASE + GP_IO_SEL);
-+
-+	tmp = inl(DEFAULT_GPIOBASE + GP_IO_SEL2);
-+	tmp = tmp & ~HYBRID_GRAPHICS_GP_LVL2_BITS;
-+	outl(tmp, DEFAULT_GPIOBASE + GP_IO_SEL2);
-+
-+	/* Set hybrid graphics detect GPIO lines to input */
-+	tmp = inl(DEFAULT_GPIOBASE + GP_IO_SEL);
-+	tmp = tmp | HYBRID_GRAPHICS_DETECT_GP_BITS;
-+	outl(tmp, DEFAULT_GPIOBASE + GP_IO_SEL);
-+}
-+
-+static bool hybrid_graphics_installed(void)
-+{
-+	if (inl(DEFAULT_GPIOBASE + GP_LVL) & HYBRID_GRAPHICS_DETECT_GP_BITS)
-+		return false;
-+	else
-+		return true;
-+}
-+
-+static void hybrid_graphics_switch_to_integrated_graphics(void)
-+{
-+	uint32_t tmp;
-+
-+	/* Disable switchable graphics */
-+	hybrid_graphics_configure_switchable_graphics(false);
-+
-+	/* Configure muxes */
-+	tmp = inl(DEFAULT_GPIOBASE + GP_LVL);
-+	tmp = tmp & ~HYBRID_GRAPHICS_GP_LVL_BITS;
-+	outl(tmp, DEFAULT_GPIOBASE + GP_LVL);
-+
-+	tmp = inl(DEFAULT_GPIOBASE + GP_LVL2);
-+	tmp = tmp & ~HYBRID_GRAPHICS_GP_LVL2_BITS;
-+	outl(tmp, DEFAULT_GPIOBASE + GP_LVL2);
-+}
-+
-+static void hybrid_graphics_switch_to_discrete_graphics(void)
-+{
-+	uint32_t tmp;
-+
-+	/* Disable switchable graphics */
-+	hybrid_graphics_configure_switchable_graphics(false);
-+
-+	/* Configure muxes */
-+	tmp = inl(DEFAULT_GPIOBASE + GP_LVL);
-+	tmp = tmp | HYBRID_GRAPHICS_GP_LVL_BITS;
-+	outl(tmp, DEFAULT_GPIOBASE + GP_LVL);
-+
-+	tmp = inl(DEFAULT_GPIOBASE + GP_LVL2);
-+	tmp = tmp | HYBRID_GRAPHICS_GP_LVL2_BITS;
-+	outl(tmp, DEFAULT_GPIOBASE + GP_LVL2);
-+}
-+
-+static void hybrid_graphics_switch_to_dual_graphics(void)
-+{
-+	/* Enable switchable graphics */
-+	hybrid_graphics_configure_switchable_graphics(true);
-+}
-+
- static void default_southbridge_gpio_setup(void)
- {
- 	outl(0x197e23fe, DEFAULT_GPIOBASE + GP_IO_USE_SEL);
-@@ -98,6 +211,31 @@ void main(unsigned long bist)
- 
- 	default_southbridge_gpio_setup();
- 
-+	uint8_t hybrid_graphics_mode = HYBRID_GRAPHICS_INTEGRATED_ONLY;
-+	get_option(&hybrid_graphics_mode, "hybrid_graphics_mode");
-+
-+	/* Set up hybrid graphics */
-+	hybrid_graphics_set_up_gpio();
-+	if (hybrid_graphics_installed()) {
-+		/* Select appropriate hybrid graphics device */
-+		printk(BIOS_DEBUG, "Hybrid graphics available, setting mode %d\n", hybrid_graphics_mode);
-+		if (hybrid_graphics_mode == HYBRID_GRAPHICS_INTEGRATED_ONLY)
-+			hybrid_graphics_switch_to_integrated_graphics();
-+		else if (hybrid_graphics_mode == HYBRID_GRAPHICS_DISCRETE_ONLY)
-+			hybrid_graphics_switch_to_discrete_graphics();
-+		else if (hybrid_graphics_mode == HYBRID_GRAPHICS_SWITCHABLE)
-+			hybrid_graphics_switch_to_integrated_graphics();
-+			/* Switchable graphics are fully enabled after raminit */
-+			/* FIXME
-+			 * Enabling switchable graphics prevents bootup!
-+			 * Debug and fix appropriately...
-+			 */
-+	}
-+	else {
-+		printk(BIOS_DEBUG, "Hybrid graphics not installed\n");
-+		hybrid_graphics_switch_to_integrated_graphics();
-+	}
-+
- 	/* ASPM related setting, set early by original BIOS. */
- 	DMIBAR16(0x204) &= ~(3 << 10);
- 
-@@ -177,6 +315,11 @@ void main(unsigned long bist)
- 	outl(inl(DEFAULT_GPIOBASE + 0x38) & ~0x400, DEFAULT_GPIOBASE + 0x38);
- 
- 	cbmem_initted = !cbmem_recovery(s3resume);
-+
-+	if (hybrid_graphics_installed())
-+		if (hybrid_graphics_mode == HYBRID_GRAPHICS_SWITCHABLE)
-+			hybrid_graphics_switch_to_dual_graphics();
-+
- #if CONFIG_HAVE_ACPI_RESUME
- 	/* If there is no high memory area, we didn't boot before, so
- 	 * this is not a resume. In that case we just create the cbmem toc.
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
deleted file mode 100644
index 4bda8e71..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6e7cdcaa317f9fdea329839b1e6e6343cd45b642 Mon Sep 17 00:00:00 2001
-From: Francis Rowe <info@gluglug.org.uk>
-Date: Mon, 15 Jun 2015 03:44:15 +0100
-Subject: [PATCH 2/9] NOTFORMERGE: lenovo/t400: hard-code enable
- integrated-only video
-
-Written with libreboot in mind. Libreboot uses native graphics
-initialization only, so we want to ensure that these systems
-only use the integrated (Intel) GPU for which native init exists.
-
-Native graphics initialization does not yet exist for the ATI GPUs
-on these laptops...
-
-Change-Id: I2c056a8fb498972f87c4ec1122b239fdc9a4c666
-Signed-off-by: Francis Rowe <info@gluglug.org.uk>
----
- src/mainboard/lenovo/t400/romstage.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/mainboard/lenovo/t400/romstage.c b/src/mainboard/lenovo/t400/romstage.c
-index c62df60..daf6fa8 100644
---- a/src/mainboard/lenovo/t400/romstage.c
-+++ b/src/mainboard/lenovo/t400/romstage.c
-@@ -212,7 +212,8 @@ void main(unsigned long bist)
- 	default_southbridge_gpio_setup();
- 
- 	uint8_t hybrid_graphics_mode = HYBRID_GRAPHICS_INTEGRATED_ONLY;
--	get_option(&hybrid_graphics_mode, "hybrid_graphics_mode");
-+	/* Not for merge! Hard-code enable integrated-only by commenting this line: */
-+	/* get_option(&hybrid_graphics_mode, "hybrid_graphics_mode");  */
- 
- 	/* Set up hybrid graphics */
- 	hybrid_graphics_set_up_gpio();
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/INFO b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/INFO
deleted file mode 100644
index 9ef6d54a..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/INFO
+++ /dev/null
@@ -1,8 +0,0 @@
-# NOTE: merged upstream already
-printf "mainboard/lenovo/t400: Add initial hybrid graphics support\n"
-git am "../resources/libreboot/patch/misc/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch"
-# git fetch http://review.coreboot.org/coreboot refs/changes/19/9319/18 && git cherry-pick FETCH_HEAD
-
-printf "NOTFORMERGE: lenovo/t400: hard-code enable integrated-only video\n"
-git am "../resources/libreboot/patch/misc/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch"
-# git fetch http://review.coreboot.org/coreboot refs/changes/50/10550/1 && git cherry-pick FETCH_HEAD
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list
deleted file mode 100644
index 410ee713..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list
+++ /dev/null
@@ -1 +0,0 @@
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_4mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_4mb/reused.list
deleted file mode 100644
index d5051b8d..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_4mb/reused.list
+++ /dev/null
@@ -1,5 +0,0 @@
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/0001-lenovo-r400-Add-clone-of-Lenovo-T400.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/0001-lenovo-t500-Add-clone-of-Lenovo-T400.patch
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/0001-lenovo-t500-Add-clone-of-Lenovo-T400.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/0001-lenovo-t500-Add-clone-of-Lenovo-T400.patch
deleted file mode 100644
index 479905d6..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/0001-lenovo-t500-Add-clone-of-Lenovo-T400.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 2a9b4169a25273dcf3c474c76455ab31d1e2839b Mon Sep 17 00:00:00 2001
-From: Francis Rowe <info@gluglug.org.uk>
-Date: Sun, 14 Jun 2015 15:40:00 +0100
-Subject: [PATCH 8/9] lenovo/t500: Add clone of Lenovo T400
-
-The existing code for the Lenovo T400 works without changes on the
-Lenovo T500.  Same HDA verbs are provided by Lenovo BIOS on both
-laptops.
-
-Change-Id: I300408a8a0ed00476aee6061925befc2822fb505
-Signed-off-by: Francis Rowe <info@gluglug.org.uk>
----
- src/mainboard/lenovo/t400/Kconfig        | 2 +-
- src/mainboard/lenovo/t500/Kconfig        | 7 +++++++
- src/mainboard/lenovo/t500/Kconfig.name   | 2 ++
- src/mainboard/lenovo/t500/board_info.txt | 6 ++++++
- 4 files changed, 16 insertions(+), 1 deletion(-)
- create mode 100644 src/mainboard/lenovo/t500/Kconfig
- create mode 100644 src/mainboard/lenovo/t500/Kconfig.name
- create mode 100644 src/mainboard/lenovo/t500/board_info.txt
-
-diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
-index 467cd63..0eac311 100644
---- a/src/mainboard/lenovo/t400/Kconfig
-+++ b/src/mainboard/lenovo/t400/Kconfig
-@@ -1,4 +1,4 @@
--if BOARD_LENOVO_T400 || BOARD_LENOVO_R400
-+if BOARD_LENOVO_T400 || BOARD_LENOVO_T500 || BOARD_LENOVO_R400
- 
- config BOARD_SPECIFIC_OPTIONS # dummy
- 	def_bool y
-diff --git a/src/mainboard/lenovo/t500/Kconfig b/src/mainboard/lenovo/t500/Kconfig
-new file mode 100644
-index 0000000..e1e8420
---- /dev/null
-+++ b/src/mainboard/lenovo/t500/Kconfig
-@@ -0,0 +1,7 @@
-+if BOARD_LENOVO_T500
-+
-+config MAINBOARD_PART_NUMBER
-+	string
-+	default "ThinkPad T500"
-+
-+endif
-diff --git a/src/mainboard/lenovo/t500/Kconfig.name b/src/mainboard/lenovo/t500/Kconfig.name
-new file mode 100644
-index 0000000..89c6087
---- /dev/null
-+++ b/src/mainboard/lenovo/t500/Kconfig.name
-@@ -0,0 +1,2 @@
-+config BOARD_LENOVO_T500
-+	bool "ThinkPad T500"
-diff --git a/src/mainboard/lenovo/t500/board_info.txt b/src/mainboard/lenovo/t500/board_info.txt
-new file mode 100644
-index 0000000..007ec6c
---- /dev/null
-+++ b/src/mainboard/lenovo/t500/board_info.txt
-@@ -0,0 +1,6 @@
-+Category: laptop
-+ROM package: SOIC-16 or SOIC-8
-+ROM protocol: SPI
-+ROM socketed: n
-+Flashrom support: n
-+Clone of: lenovo/t400
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/INFO b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/INFO
deleted file mode 100644
index 0537bbc8..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/INFO
+++ /dev/null
@@ -1,4 +0,0 @@
-# NOTE: remove this when updating coreboot. This has been merged upstream
-printf "ThinkPad T500 (depends on T400 patch)\n"
-git am "../resources/libreboot/patch/misc/0008-lenovo-t500-Add-clone-of-Lenovo-T400.patch"
-# git fetch http://review.coreboot.org/coreboot refs/changes/45/10545/1 && git cherry-pick FETCH_HEAD
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/reused.list
deleted file mode 100644
index fe69c350..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/reused.list
+++ /dev/null
@@ -1,4 +0,0 @@
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/0001-lenovo-r400-Add-clone-of-Lenovo-T400.patch
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/0001-lenovo-t60-Enable-brightness-controls-native-graphic.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/0001-lenovo-t60-Enable-brightness-controls-native-graphic.patch
deleted file mode 100644
index ec6b33ee..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/0001-lenovo-t60-Enable-brightness-controls-native-graphic.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 770021ce66a0fddebb9639c4df0696ecfca45488 Mon Sep 17 00:00:00 2001
-From: Francis Rowe <info@gluglug.org.uk>
-Date: Mon, 15 Jun 2015 19:59:46 +0100
-Subject: [PATCH 4/9] lenovo/t60: Enable brightness controls (native graphics)
-
-This makes the Fn Home/End keys work for controlling the
-brightness of the display. Value obtained by reading
-BLC_PWM_CTL when running the VBIOS (option ROM).
-
-On i945 legacy brightness control is enabled by a single
-bit in BLC_PWM_CTL. It's bit 16 or bit 0 (the other one
-reverses polarity). Set the bit to enable brightness
-controls.
-
-Change-Id: I22e261f2ce28ec81cd208a73e6311ec67146eb72
-Signed-off-by: Francis Rowe <info@gluglug.org.uk>
----
- src/mainboard/lenovo/t60/devicetree.cb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
-index b28f1ad..9e6ce02 100644
---- a/src/mainboard/lenovo/t60/devicetree.cb
-+++ b/src/mainboard/lenovo/t60/devicetree.cb
-@@ -26,7 +26,7 @@ chip northbridge/intel/i945
- 
- 	register "gpu_hotplug" = "0x00000220"
- 	register "gpu_lvds_use_spread_spectrum_clock" = "1"
--	register "gpu_backlight" = "0x1280128"
-+	register "gpu_backlight" = "0x58BF58BE"
- 
- 	device cpu_cluster 0 on
- 		chip cpu/intel/socket_mFCPGA478
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/INFO b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/INFO
deleted file mode 100644
index cb543aae..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/INFO
+++ /dev/null
@@ -1,3 +0,0 @@
-printf "lenovo/t60: Enable brightness controls (native graphics)\n"
-git am "../resources/libreboot/patch/misc/0004-lenovo-t60-Enable-brightness-controls-native-graphic.patch"
-# git fetch http://review.coreboot.org/coreboot refs/changes/52/10552/2 && git cherry-pick FETCH_HEAD
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/reused.list
deleted file mode 100644
index 410ee713..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/reused.list
+++ /dev/null
@@ -1 +0,0 @@
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_4mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_4mb/reused.list
deleted file mode 100644
index 1b47b43a..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_4mb/reused.list
+++ /dev/null
@@ -1,2 +0,0 @@
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/0001-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/0001-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/0001-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch
deleted file mode 100644
index 33b7978a..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/0001-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 115b09a63d1e5eb07d8c12a6c5369c1577b41f42 Mon Sep 17 00:00:00 2001
-From: Steve Shenton <sgsit@libreboot.org>
-Date: Fri, 7 Aug 2015 08:22:27 +0100
-Subject: [PATCH 6/9] northbridge/gm45/raminit.c: enable GS45 high-performance
- mode
-
-The datasheets for GS45 describe a high- and low-performance mode
-for different CPUs. Coreboot currently disables GS45 altogether,
-but forcing coreboot to treat high-performance GS45 as GM45 makes
-the X200S and X200 Tablet boot if it has the right CPU type.
-
-Hardcode-enable GS45 high-performance mode in coreboot, passing it
-off as GM45. This is known to work with all CPUs except the SU
-(low performance) models.
-
-The low-performance models are unsupported anyway, requiring
-extensive work on the raminit. For now, this patch increases
-compatibility to a whole new chipset (GS45), depending on the CPU.
-
-Change-Id: I2719385e93c37d254ce38e0f5f486262160234e1
-Signed-off-by: Steve Shenton <sgsit@libreboot.org>
-Signed-off-by: Francis Rowe <info@gluglug.org.uk>
----
- src/northbridge/intel/gm45/raminit.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/northbridge/intel/gm45/raminit.c b/src/northbridge/intel/gm45/raminit.c
-index 9c4fecd..1614b7c 100644
---- a/src/northbridge/intel/gm45/raminit.c
-+++ b/src/northbridge/intel/gm45/raminit.c
-@@ -108,8 +108,7 @@ void get_gmch_info(sysinfo_t *sysinfo)
- 			printk(BIOS_SPEW, "GMCH: GS40\n");
- 			break;
- 		case GMCH_GS45:
--			printk(BIOS_SPEW, "GMCH: GS45, using low power mode by default\n");
--			sysinfo->gs45_low_power_mode = 1;
-+			printk(BIOS_SPEW, "GMCH: GS45, using high performance mode by default\n");
- 			break;
- 		case GMCH_PM45:
- 			printk(BIOS_SPEW, "GMCH: PM45\n");
-@@ -1692,7 +1691,7 @@ void raminit(sysinfo_t *const sysinfo, const int s3resume)
- {
- 	const dimminfo_t *const dimms = sysinfo->dimms;
- 	const timings_t *const timings = &sysinfo->selected_timings;
--	const int sff = sysinfo->gfx_type == GMCH_GS45;
-+	const int sff = (sysinfo->gfx_type == GMCH_GS45) && (sysinfo->gs45_low_power_mode == 1);
- 
- 	int ch;
- 	u8 reg8;
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/INFO b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/INFO
deleted file mode 100644
index 220b8583..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/INFO
+++ /dev/null
@@ -1,5 +0,0 @@
-# NOTE: remove this when updating to the latest version of coreboot. this patch
-# makes the patch below redundant: https://review.coreboot.org/#/c/12814/
-printf "northbridge/gm45/raminit.c: enable GS45 high-perf (i.e. add X200S support to libreboot)\n"
-git am "../resources/libreboot/patch/misc/0006-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch"
-# git fetch http://review.coreboot.org/coreboot refs/changes/35/11135/3 && git cherry-pick FETCH_HEAD
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/reused.list
deleted file mode 100644
index 410ee713..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/reused.list
+++ /dev/null
@@ -1 +0,0 @@
-/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
deleted file mode 100644
index b088d3e1..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 1024b5e6c476dcc195dca742746735277f63236b Mon Sep 17 00:00:00 2001
-From: Francis Rowe <info@gluglug.org.uk>
-Date: Mon, 13 Oct 2014 00:14:53 +0100
-Subject: [PATCH 5/9] NOTFORMERGE: ec/lenovo/h8:
- wlan/trackpoint/touchpad/bluetooth/wwan
-
-Permanently enable them.
-
-Change-Id: Ic76ab9ab9c865f30312378e18af58bece6c3260a
-Signed-off-by: Francis Rowe <info@gluglug.org.uk>
----
- src/ec/lenovo/h8/h8.c     | 21 +++++++++++----------
- src/ec/lenovo/pmh7/pmh7.c | 11 ++++-------
- 2 files changed, 15 insertions(+), 17 deletions(-)
-
-diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
-index 2cafc88..a6cb6b6 100644
---- a/src/ec/lenovo/h8/h8.c
-+++ b/src/ec/lenovo/h8/h8.c
-@@ -255,9 +255,11 @@ static void h8_enable(struct device *dev)
- 
- 	ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO);
- 
--	if (get_option(&val, "wlan") != CB_SUCCESS)
--		val = 1;
--	h8_wlan_enable(val);
-+	// Permanently enable wifi
-+	// Intel wifi could be a security risk because it uses firmware. Wlan chip has DMA
-+	// and could leak data over a side-channel. Using another manufacturer is recommended.
-+	// see http://libreboot.org/docs/index.html#recommended_wifi
-+	h8_wlan_enable(1);
- 
- 	h8_trackpoint_enable(1);
- 	h8_usb_power_enable(1);
-@@ -265,14 +267,13 @@ static void h8_enable(struct device *dev)
- 	if (get_option(&val, "volume") == CB_SUCCESS)
- 		ec_write(H8_VOLUME_CONTROL, val);
- 
--	if (get_option(&val, "bluetooth") != CB_SUCCESS)
--		val = 1;
--	h8_bluetooth_enable(val);
--
--	if (get_option(&val, "wwan") != CB_SUCCESS)
--		val = 1;
-+	// Permanently enable bluetooth.
-+	// NOTE: bluetooth is a potential security risk. Physical removal of the bluetooth module is recommended.
-+	h8_bluetooth_enable(1);
- 
--	h8_wwan_enable(val);
-+	// Permanently enable wwan.
-+	// NOTE: wwan is a security risk (remove access plus DMA). Physical removal of both the wwan and sim card is recommended.
-+	h8_wwan_enable(1);
- 
- 	if (conf->has_uwb) {
- 		if (get_option(&val, "uwb") != CB_SUCCESS)
-diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c
-index cc6e891..38aef16 100644
---- a/src/ec/lenovo/pmh7/pmh7.c
-+++ b/src/ec/lenovo/pmh7/pmh7.c
-@@ -106,7 +106,6 @@ static void enable_dev(struct device *dev)
- {
- 	struct ec_lenovo_pmh7_config *conf = dev->chip_info;
- 	struct resource *resource;
--	u8 val;
- 
- 	resource = new_resource(dev, EC_LENOVO_PMH7_INDEX);
- 	resource->flags = IORESOURCE_IO | IORESOURCE_FIXED;
-@@ -118,13 +117,11 @@ static void enable_dev(struct device *dev)
- 	pmh7_backlight_enable(conf->backlight_enable);
- 	pmh7_dock_event_enable(conf->dock_event_enable);
- 
--	if (get_option(&val, "touchpad") != CB_SUCCESS)
--		val = 1;
--	pmh7_touchpad_enable(val);
-+	// Permanently enable touchpad
-+	pmh7_touchpad_enable(1);
- 
--	if (get_option(&val, "trackpoint") != CB_SUCCESS)
--		val = 1;
--	pmh7_trackpoint_enable(val);
-+	// Permanently enable trackpoint
-+	pmh7_trackpoint_enable(1);
- }
- 
- struct chip_operations ec_lenovo_pmh7_ops = {
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0002-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0002-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch
deleted file mode 100644
index 4afc7f57..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0002-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e4b5b65c93122126344771f2042f8d7a3468be19 Mon Sep 17 00:00:00 2001
-From: Francis Rowe <info@gluglug.org.uk>
-Date: Mon, 22 Jun 2015 17:37:06 +0100
-Subject: [PATCH 3/9] lenovo/x60: use correct BLC_PWM_CTL value
-
-Bit 16 in BLC_PWM_CTL enables brightness controls, but the
-current value is generic. Use the proper value, obtained
-by reading BLC_PWM_CTL while running the VBIOS.
-
-Change-Id: Ib273359e1c285b405a9bb26fc217c2f7e255b99f
-Signed-off-by: Francis Rowe <info@gluglug.org.uk>
----
- src/mainboard/lenovo/x60/devicetree.cb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
-index b4d1144..4d62116 100644
---- a/src/mainboard/lenovo/x60/devicetree.cb
-+++ b/src/mainboard/lenovo/x60/devicetree.cb
-@@ -26,7 +26,7 @@ chip northbridge/intel/i945
- 
- 	register "gpu_hotplug" = "0x00000220"
- 	register "gpu_lvds_use_spread_spectrum_clock" = "1"
--	register "gpu_backlight" = "0x1290128"
-+	register "gpu_backlight" = "0x879F879E"
- 
- 	device cpu_cluster 0 on
- 		chip cpu/intel/socket_mFCPGA478
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/INFO b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/INFO
deleted file mode 100644
index 4f5931f9..00000000
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/INFO
+++ /dev/null
@@ -1,7 +0,0 @@
-printf "lenovo/x60: use correct BLC_PWM_CTL value\n"
-git am "../resources/libreboot/patch/misc/0003-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch"
-# git fetch http://review.coreboot.org/coreboot refs/changes/24/10624/2 && git cherry-pick FETCH_HEAD
-
-printf "ec/lenovo/h8: permanently enable wifi/trackpoint/touchpad/bluetooth/wwan\n"
-git am "../resources/libreboot/patch/misc/0005-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch"
-# git fetch http://review.coreboot.org/coreboot refs/changes/58/7058/9 && git cherry-pick FETCH_HEAD