all i945 and gm45 boards: bump coreboot revision

11 files changed, 0 insertions, 496 deletions

diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/reused.list b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/reused.list
deleted file mode 100644
index 5dd5800f..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/macbook21/reused.list
+++ /dev/null
@@ -1,2 +0,0 @@
-/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-i945-Enable-changing-VRAM-size.patch
-/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0004-model_6ex-enable-C2E-C4E-dynamic-lvl-2-cache.patch
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0001-lenovo-t60-Enable-brightness-controls-native-graphic.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0001-lenovo-t60-Enable-brightness-controls-native-graphic.patch
deleted file mode 100644
index 2e3ee65b..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/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: Leah Rowe <info@minifree.org>
-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: Leah Rowe <info@minifree.org>
----
- 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/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/INFO b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/INFO
deleted file mode 100644
index cb543aae..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/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/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/reused.list b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/reused.list
deleted file mode 100644
index 157e1cf6..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/reused.list
+++ /dev/null
@@ -1,3 +0,0 @@
-/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
-/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-i945-Enable-changing-VRAM-size.patch
-/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0004-model_6ex-enable-C2E-C4E-dynamic-lvl-2-cache.patch
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
deleted file mode 100644
index 6f8b5307..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/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: Leah Rowe <info@minifree.org>
-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: Leah Rowe <info@minifree.org>
----
- 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/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-i945-Enable-changing-VRAM-size.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-i945-Enable-changing-VRAM-size.patch
deleted file mode 100644
index ce1d37c0..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-i945-Enable-changing-VRAM-size.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 44b3d02a49bc25dc8e9119a11bd948db2c37a931 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Sun, 15 May 2016 02:17:12 +0200
-Subject: [PATCH] i945: Enable changing VRAM size
-
-On i945 the vram size was the default 8mb. It was also possible
-to set it 1mb or 0mb hardcoding the GGC register in early_init.c
-
-The intel documentation on i945 only documents those three options.
-They are set using 3 bits. The documententation also makes mention
-of 4mb, 16mb, 32mb, 48mb, 64mb but not how to set it.
-
-The other non documented (straight forward) bit combinations allows
-to change the VRAM size to those other states.
-
-Change-Id: I5e510e81322a4c8315c01b7963ac4b5f7f58a17e
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
-
-diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
-index 6e8d35b..484ed78 100644
---- a/src/northbridge/intel/i945/Kconfig
-+++ b/src/northbridge/intel/i945/Kconfig
-@@ -72,3 +72,56 @@ config CHECK_SLFRCS_ON_RESUME
- 	  effectively making it impossible to resume.
- 
- endif
-+
-+config VRAM_CHOICE
-+        bool
-+choice
-+	prompt "VRAM Size"
-+	depends on NORTHBRIDGE_INTEL_I945
-+	default VRAM_SIZE_8MB
-+	help
-+	  Set the size of vram that the integrated graphic device can use
-+	  for a framebuffer.
-+
-+config VRAM_SIZE_1MB
-+	bool "1 MB"
-+	help
-+	  Set VRAM size to 1MB.
-+config VRAM_SIZE_4MB
-+	bool "4 MB"
-+	help
-+	  Set VRAM size to 4MB.
-+config VRAM_SIZE_8MB
-+	bool "8 MB"
-+	help
-+	  Set VRAM size to 8MB.
-+config VRAM_SIZE_16MB
-+	bool "16 MB"
-+	help
-+	  Set VRAM size to 16MB.
-+config VRAM_SIZE_32MB
-+	bool "32 MB"
-+	help
-+	  Set VRAM size to 32MB.
-+config VRAM_SIZE_48MB
-+	bool "48 MB"
-+	help
-+	  Set VRAM size to 48MB.
-+config VRAM_SIZE_64MB
-+	bool "64 MB"
-+	help
-+	  Set VRAM size to 64MB.
-+
-+endchoice
-+
-+config VRAM_SIZE
-+	hex
-+	default 0x10 if VRAM_SIZE_1MB
-+	default 0x20 if VRAM_SIZE_4MB
-+	default 0x30 if VRAM_SIZE_8MB
-+	default 0x40 if VRAM_SIZE_16MB
-+	default 0x50 if VRAM_SIZE_32MB
-+	default 0x60 if VRAM_SIZE_48MB
-+	default 0x70 if VRAM_SIZE_64MB
-+	help
-+	 map the vram sizes to an integer.
-diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c
-index 475e88a..bd062ad 100644
---- a/src/northbridge/intel/i945/early_init.c
-+++ b/src/northbridge/intel/i945/early_init.c
-@@ -177,11 +177,8 @@ static void i945_setup_bars(void)
- 	pci_write_config32(PCI_DEV(0, 0x00, 0), DMIBAR, (uintptr_t)DEFAULT_DMIBAR | 1);
- 	pci_write_config32(PCI_DEV(0, 0x00, 0), X60BAR, DEFAULT_X60BAR | 1);
- 
--	/* Hardware default is 8MB UMA. If someone wants to make this a
--	 * CMOS or compile time option, send a patch.
--	 * pci_write_config16(PCI_DEV(0, 0x00, 0), GGC, 0x30);
--	 */
--
-+	/* Sets up VRAM size from the build option VRAM_SIZE */
-+	pci_write_config16(PCI_DEV(0, 0x00, 0), GGC, CONFIG_VRAM_SIZE);
- 	/* Set C0000-FFFFF to access RAM on both reads and writes */
- 	pci_write_config8(PCI_DEV(0, 0x00, 0), PAM0, 0x30);
- 	pci_write_config8(PCI_DEV(0, 0x00, 0), PAM1, 0x33);
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index df13ef4..f853cc8 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -359,9 +359,24 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf,
- 		case 1:
- 			uma_size = 1024;
- 			break;
-+		case 2:
-+			uma_size = 4096;
-+			break;
- 		case 3:
- 			uma_size = 8192;
- 			break;
-+		case 4:
-+			uma_size = 16384;
-+			break;
-+		case 5:
-+			uma_size = 32768;
-+			break;
-+		case 6:
-+			uma_size = 49152;
-+			break;
-+		case 7:
-+			uma_size = 65536;
-+			break;
- 		}
- 
- 		printk(BIOS_DEBUG, "%dM UMA\n", uma_size >> 10);
-diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
-index 514f88c..4be9827 100644
---- a/src/northbridge/intel/i945/northbridge.c
-+++ b/src/northbridge/intel/i945/northbridge.c
-@@ -112,9 +112,24 @@ static void pci_domain_set_resources(device_t dev)
- 		case 1:
- 			uma_size = 1024;
- 			break;
-+		case 2:
-+			uma_size = 4096;
-+			break;
- 		case 3:
- 			uma_size = 8192;
- 			break;
-+		case 4:
-+			uma_size = 16384;
-+			break;
-+		case 5:
-+			uma_size = 32768;
-+			break;
-+		case 6:
-+			uma_size = 49152;
-+			break;
-+		case 7:
-+			uma_size = 65536;
-+			break;
- 		}
- 
- 		printk(BIOS_DEBUG, "%dM UMA\n", uma_size >> 10);
--- 
-2.8.2
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-lenovo-x60-add-hda_verb.c.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-lenovo-x60-add-hda_verb.c.patch
deleted file mode 100644
index 80eda28b..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0001-lenovo-x60-add-hda_verb.c.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 4f3452fc544d4e799445c3271b1022496932473c Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Fri, 3 Jun 2016 18:37:38 +0200
-Subject: [PATCH] lenovo/x60: add hda_verb.c
-
-This creates a config for the x60 audio based
-on values taken from vendor bios.
-
-What is improved:
-- internal microphone is chosen by default
-- when jack is inserted it chosen instead of internal speaker
-
-Before this had to be done manually.
-
-Change-Id: Id3b700fd84905a72cc1f69e7d8bfa6145f231756
-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
-
-diff --git a/src/mainboard/lenovo/x60/hda_verb.c b/src/mainboard/lenovo/x60/hda_verb.c
-index 072a306..c4b1f3a 100644
---- a/src/mainboard/lenovo/x60/hda_verb.c
-+++ b/src/mainboard/lenovo/x60/hda_verb.c
-@@ -1,7 +1,38 @@
-+/*
-+ * This file is part of the coreboot project.
-+ *
-+ * Copyright (C) 2016 Arthur Heymans <arthur@aheymans.xyz>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; version 2 of
-+ * the License.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
- #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.8.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0002-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0002-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch
deleted file mode 100644
index 7470dd60..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/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: Leah Rowe <info@minifree.org>
-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: Leah Rowe <info@minifree.org>
----
- 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/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0004-model_6ex-enable-C2E-C4E-dynamic-lvl-2-cache.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0004-model_6ex-enable-C2E-C4E-dynamic-lvl-2-cache.patch
deleted file mode 100644
index 14f809a9..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0004-model_6ex-enable-C2E-C4E-dynamic-lvl-2-cache.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 483bbb3ec7965ca2416fda9e11687bcd655d078d Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur@aheymans.xyz>
-Date: Tue, 31 May 2016 16:51:59 +0200
-Subject: [PATCH] model_6ex: enable C2E, C4E, dynamic lvl 2 cache.
-
-Change-Id: Ie538d2145640c7b50ac0a0fa432d98ae2c4be060
-
-diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
-index 6fa6d3a..8ff276a 100644
---- a/src/cpu/intel/model_6ex/model_6ex_init.c
-+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
-@@ -67,9 +67,10 @@ static void configure_c_states(void)
- 
- 	msr = rdmsr(MSR_PMG_CST_CONFIG_CONTROL);
- 	msr.lo |= (1 << 15); // config lock until next reset.
-+	msr.lo |= (1 << 14); // Deeper Sleep
- 	msr.lo |= (1 << 10); // Enable I/O MWAIT redirection for C-States
- 	msr.lo &= ~(1 << 9); // Issue a single stop grant cycle upon stpclk
--	// TODO Do we want Deep C4 and  Dynamic L2 shrinking?
-+	msr.lo |= (1 << 3); // Dynamic L2
- 
- 	/* Number of supported C-States */
- 	msr.lo &= ~7;
-@@ -94,16 +95,20 @@ static void configure_misc(void)
- 	msr_t msr;
- 
- 	msr = rdmsr(IA32_MISC_ENABLE);
--	msr.lo |= (1 << 3); 	/* TM1 enable */
-+	msr.lo |= (1 << 3);	/* TM1 enable */
- 	msr.lo |= (1 << 13);	/* TM2 enable */
- 	msr.lo |= (1 << 17);	/* Bidirectional PROCHOT# */
- 
- 	msr.lo |= (1 << 10);	/* FERR# multiplexing */
- 
--	// TODO: Only if  IA32_PLATFORM_ID[17] = 0 and IA32_PLATFORM_ID[50] = 1
- 	msr.lo |= (1 << 16);	/* Enhanced SpeedStep Enable */
-+	/* Enable C2E */
-+	msr.lo |= (1 << 26);
-+
-+	/* Enable C4E */
-+	msr.hi |= (1 << (32 - 32)); // C4E
-+	msr.hi |= (1 << (33 - 32)); // Hard C4E
- 
--	// TODO Do we want Deep C4 and  Dynamic L2 shrinking?
- 	wrmsr(IA32_MISC_ENABLE, msr);
- 
- 	msr.lo |= (1 << 20);	/* Lock Enhanced SpeedStep Enable */
--- 
-2.8.3
-
diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/INFO b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/INFO
deleted file mode 100644
index 4f5931f9..00000000
--- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/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