reset x60/t60/macbook21 to older coreboot revisions

This is a temporary fix for an upcoming release.

25 files changed, 500 insertions, 66 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
index fe69c350..e801b8c0 100644
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_4mb/reused.list
+++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_4mb/reused.list
@@ -1,4 +1,4 @@
-/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-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/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/reused.list
index 7a1a07b4..bcbb7fe3 100644
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/reused.list
+++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/reused.list
@@ -1,3 +1,3 @@
-/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-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
index 7a1a07b4..bcbb7fe3 100644
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_4mb/reused.list
+++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_4mb/reused.list
@@ -1,3 +1,3 @@
-/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-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/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
index b088d3e1..b088d3e1 100644
--- 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/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list
index 410ee713..5bd12d05 100644
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list
+++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list
@@ -1 +1 @@
-/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-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
index d5051b8d..c7c8d207 100644
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_4mb/reused.list
+++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_4mb/reused.list
@@ -1,4 +1,4 @@
-/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-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/t500_8mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/reused.list
index fe69c350..e801b8c0 100644
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/reused.list
+++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/reused.list
@@ -1,4 +1,4 @@
-/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-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
index 1b47b43a..40c0d612 100644
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_4mb/reused.list
+++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_4mb/reused.list
@@ -1,2 +1,2 @@
-/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-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/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/reused.list
index 410ee713..5bd12d05 100644
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/reused.list
+++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/reused.list
@@ -1 +1 @@
-/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-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
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
diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch
new file mode 100644
index 00000000..691c30d9
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch
@@ -0,0 +1,26 @@
+From e1a421df8add1b976ee9bd001c88fbc95900e1f3 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Thu, 21 Aug 2014 02:25:59 +0200
+Subject: [PATCH 13/22] lenovo/x60: Enable text mode native gfx init
+
+Change-Id: I3aad96a7034c73e447cf8995473a45ffd3893f3f
+Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
+---
+ src/mainboard/lenovo/x60/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
+index 0125d8c..ab4b58e 100644
+--- a/src/mainboard/lenovo/x60/Kconfig
++++ b/src/mainboard/lenovo/x60/Kconfig
+@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
+ 	select HAVE_ACPI_RESUME
+ 	select USE_OPTION_TABLE
+ 	select MAINBOARD_HAS_NATIVE_VGA_INIT
++	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
+ 	select H8_DOCK_EARLY_INIT
+ 	select DRIVERS_LENOVO_WACOM
+ 	select INTEL_EDID
+-- 
+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/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch
index 4afc7f57..1c5b4b32 100644
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0002-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch
@@ -1,27 +1,26 @@
-From e4b5b65c93122126344771f2042f8d7a3468be19 Mon Sep 17 00:00:00 2001
+From 89f4c7561e486030d867674e4df2978a7260c4a7 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
+Date: Sat, 11 Oct 2014 16:43:28 +0100
+Subject: [PATCH 14/22] lenovo/x60: Enable legacy brightness controls (native
+ graphics)
 
-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.
+Value obtained by reading BLC_PWM_CTL when running the VBIOS (option ROM).
 
-Change-Id: Ib273359e1c285b405a9bb26fc217c2f7e255b99f
+Change-Id: Id855c4e91fe71fb489739e62fbe99ca22841acd2
 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
+index 382ebaf..4e02d3c 100644
 --- a/src/mainboard/lenovo/x60/devicetree.cb
 +++ b/src/mainboard/lenovo/x60/devicetree.cb
-@@ -26,7 +26,7 @@ chip northbridge/intel/i945
- 
+@@ -25,7 +25,7 @@ chip northbridge/intel/i945
  	register "gpu_hotplug" = "0x00000220"
  	register "gpu_lvds_use_spread_spectrum_clock" = "1"
--	register "gpu_backlight" = "0x1290128"
+ 	register "gpu_lvds_is_dual_channel" = "0"
+-	register "gpu_backlight" = "0x1280128"
 +	register "gpu_backlight" = "0x879F879E"
  
  	device cpu_cluster 0 on
diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch
new file mode 100644
index 00000000..f54094a0
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch
@@ -0,0 +1,49 @@
+From 5a762600dd0d41c1f1f24dfccea62d9cefb5b3d6 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Tue, 4 Mar 2014 18:08:26 +0100
+Subject: [PATCH 15/22] lenovo/t60: Enable native intel gfx init.
+
+Tested on T60 with intel graphics.
+
+Change-Id: Id74d0a1315749052e7313135242e6b64862aa5e1
+Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
+---
+ src/mainboard/lenovo/t60/Kconfig       | 3 +++
+ src/mainboard/lenovo/t60/devicetree.cb | 5 +++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
+index 0cf19a1..2254185 100644
+--- a/src/mainboard/lenovo/t60/Kconfig
++++ b/src/mainboard/lenovo/t60/Kconfig
+@@ -20,8 +20,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
+ 	select CHANNEL_XOR_RANDOMIZATION
+ 	select HAVE_ACPI_TABLES
+ 	select HAVE_ACPI_RESUME
++	select MAINBOARD_HAS_NATIVE_VGA_INIT
+ 	select H8_DOCK_EARLY_INIT
+ 	select HAVE_CMOS_DEFAULT
++	select INTEL_EDID
++
+ config MAINBOARD_DIR
+ 	string
+ 	default lenovo/t60
+diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
+index bca0787..a0ee7f9 100644
+--- a/src/mainboard/lenovo/t60/devicetree.cb
++++ b/src/mainboard/lenovo/t60/devicetree.cb
+@@ -22,6 +22,11 @@
+ 
+ chip northbridge/intel/i945
+ 
++	register "gpu_hotplug" = "0x00000220"
++	register "gpu_lvds_use_spread_spectrum_clock" = "1"
++	register "gpu_lvds_is_dual_channel" = "1"
++	register "gpu_backlight" = "0x1280128"
++
+ 	device cpu_cluster 0 on
+ 		chip cpu/intel/socket_mFCPGA478
+ 			device lapic 0 on end
+-- 
+1.9.1
+
diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch
new file mode 100644
index 00000000..6aee3ad1
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch
@@ -0,0 +1,26 @@
+From 875078b081cfe58eaf755bfdd10c743b7207be0f Mon Sep 17 00:00:00 2001
+From: Francis Rowe <info@gluglug.org.uk>
+Date: Sat, 11 Oct 2014 18:41:35 +0100
+Subject: [PATCH 16/22] lenovo/t60: Enable text mode native gfx init
+
+Change-Id: Iffd2b1d5f86d4b872f8d39466cbbccd088ef7784
+Signed-off-by: Francis Rowe <info@gluglug.org.uk>
+---
+ src/mainboard/lenovo/t60/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
+index 2254185..52eeda3 100644
+--- a/src/mainboard/lenovo/t60/Kconfig
++++ b/src/mainboard/lenovo/t60/Kconfig
+@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
+ 	select HAVE_ACPI_TABLES
+ 	select HAVE_ACPI_RESUME
+ 	select MAINBOARD_HAS_NATIVE_VGA_INIT
++	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
+ 	select H8_DOCK_EARLY_INIT
+ 	select HAVE_CMOS_DEFAULT
+ 	select INTEL_EDID
+-- 
+1.9.1
+
diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch
new file mode 100644
index 00000000..7757620a
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch
@@ -0,0 +1,30 @@
+From 519a5be5914a2949f93f4c2f76b22cf4e6102879 Mon Sep 17 00:00:00 2001
+From: Francis Rowe <info@gluglug.org.uk>
+Date: Sat, 11 Oct 2014 20:36:10 +0100
+Subject: [PATCH 17/22] lenovo/t60: Enable legacy brightness controls (native
+ graphics)
+
+Value obtained by reading BLC_PWM_CTL when running the VBIOS (option ROM).
+
+Change-Id: I95f634c5071f6d4bdd423819ce4e40985732761c
+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 a0ee7f9..43f570e 100644
+--- a/src/mainboard/lenovo/t60/devicetree.cb
++++ b/src/mainboard/lenovo/t60/devicetree.cb
+@@ -25,7 +25,7 @@ chip northbridge/intel/i945
+ 	register "gpu_hotplug" = "0x00000220"
+ 	register "gpu_lvds_use_spread_spectrum_clock" = "1"
+ 	register "gpu_lvds_is_dual_channel" = "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/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
new file mode 100644
index 00000000..70bf654a
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
@@ -0,0 +1,95 @@
+From a36e204862fc556c7d06cbc9c29f6b0a4df21287 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 18/22] NOTFORMERGE: ec/lenovo/h8:
+ wlan/trackpoint/touchpad/bluetooth/wwan
+
+Permanently enable them. Ignore configuration made by nvramtool.
+Almost every user will want all of these to be enabled, and those
+who would like them to be disabled would physically remove the
+relevant components from their machine anyway, or just not use
+them (in the case of the touchpad or trackpoint). So, why make it
+configurable in the first place? All it does is add confusion.
+
+The mind boggles.
+
+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 13b0483..b688e64 100644
+--- a/src/ec/lenovo/h8/h8.c
++++ b/src/ec/lenovo/h8/h8.c
+@@ -245,9 +245,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);
+@@ -255,14 +257,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 f67fbda..9cb7149 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/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch
new file mode 100644
index 00000000..691c30d9
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch
@@ -0,0 +1,26 @@
+From e1a421df8add1b976ee9bd001c88fbc95900e1f3 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Thu, 21 Aug 2014 02:25:59 +0200
+Subject: [PATCH 13/22] lenovo/x60: Enable text mode native gfx init
+
+Change-Id: I3aad96a7034c73e447cf8995473a45ffd3893f3f
+Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
+---
+ src/mainboard/lenovo/x60/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
+index 0125d8c..ab4b58e 100644
+--- a/src/mainboard/lenovo/x60/Kconfig
++++ b/src/mainboard/lenovo/x60/Kconfig
+@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
+ 	select HAVE_ACPI_RESUME
+ 	select USE_OPTION_TABLE
+ 	select MAINBOARD_HAS_NATIVE_VGA_INIT
++	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
+ 	select H8_DOCK_EARLY_INIT
+ 	select DRIVERS_LENOVO_WACOM
+ 	select INTEL_EDID
+-- 
+1.9.1
+
diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch
new file mode 100644
index 00000000..1c5b4b32
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch
@@ -0,0 +1,30 @@
+From 89f4c7561e486030d867674e4df2978a7260c4a7 Mon Sep 17 00:00:00 2001
+From: Francis Rowe <info@gluglug.org.uk>
+Date: Sat, 11 Oct 2014 16:43:28 +0100
+Subject: [PATCH 14/22] lenovo/x60: Enable legacy brightness controls (native
+ graphics)
+
+Value obtained by reading BLC_PWM_CTL when running the VBIOS (option ROM).
+
+Change-Id: Id855c4e91fe71fb489739e62fbe99ca22841acd2
+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 382ebaf..4e02d3c 100644
+--- a/src/mainboard/lenovo/x60/devicetree.cb
++++ b/src/mainboard/lenovo/x60/devicetree.cb
+@@ -25,7 +25,7 @@ chip northbridge/intel/i945
+ 	register "gpu_hotplug" = "0x00000220"
+ 	register "gpu_lvds_use_spread_spectrum_clock" = "1"
+ 	register "gpu_lvds_is_dual_channel" = "0"
+-	register "gpu_backlight" = "0x1280128"
++	register "gpu_backlight" = "0x879F879E"
+ 
+ 	device cpu_cluster 0 on
+ 		chip cpu/intel/socket_mFCPGA478
+-- 
+1.9.1
+
diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch
new file mode 100644
index 00000000..f54094a0
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch
@@ -0,0 +1,49 @@
+From 5a762600dd0d41c1f1f24dfccea62d9cefb5b3d6 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Tue, 4 Mar 2014 18:08:26 +0100
+Subject: [PATCH 15/22] lenovo/t60: Enable native intel gfx init.
+
+Tested on T60 with intel graphics.
+
+Change-Id: Id74d0a1315749052e7313135242e6b64862aa5e1
+Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
+---
+ src/mainboard/lenovo/t60/Kconfig       | 3 +++
+ src/mainboard/lenovo/t60/devicetree.cb | 5 +++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
+index 0cf19a1..2254185 100644
+--- a/src/mainboard/lenovo/t60/Kconfig
++++ b/src/mainboard/lenovo/t60/Kconfig
+@@ -20,8 +20,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
+ 	select CHANNEL_XOR_RANDOMIZATION
+ 	select HAVE_ACPI_TABLES
+ 	select HAVE_ACPI_RESUME
++	select MAINBOARD_HAS_NATIVE_VGA_INIT
+ 	select H8_DOCK_EARLY_INIT
+ 	select HAVE_CMOS_DEFAULT
++	select INTEL_EDID
++
+ config MAINBOARD_DIR
+ 	string
+ 	default lenovo/t60
+diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
+index bca0787..a0ee7f9 100644
+--- a/src/mainboard/lenovo/t60/devicetree.cb
++++ b/src/mainboard/lenovo/t60/devicetree.cb
+@@ -22,6 +22,11 @@
+ 
+ chip northbridge/intel/i945
+ 
++	register "gpu_hotplug" = "0x00000220"
++	register "gpu_lvds_use_spread_spectrum_clock" = "1"
++	register "gpu_lvds_is_dual_channel" = "1"
++	register "gpu_backlight" = "0x1280128"
++
+ 	device cpu_cluster 0 on
+ 		chip cpu/intel/socket_mFCPGA478
+ 			device lapic 0 on end
+-- 
+1.9.1
+
diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch
new file mode 100644
index 00000000..6aee3ad1
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch
@@ -0,0 +1,26 @@
+From 875078b081cfe58eaf755bfdd10c743b7207be0f Mon Sep 17 00:00:00 2001
+From: Francis Rowe <info@gluglug.org.uk>
+Date: Sat, 11 Oct 2014 18:41:35 +0100
+Subject: [PATCH 16/22] lenovo/t60: Enable text mode native gfx init
+
+Change-Id: Iffd2b1d5f86d4b872f8d39466cbbccd088ef7784
+Signed-off-by: Francis Rowe <info@gluglug.org.uk>
+---
+ src/mainboard/lenovo/t60/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
+index 2254185..52eeda3 100644
+--- a/src/mainboard/lenovo/t60/Kconfig
++++ b/src/mainboard/lenovo/t60/Kconfig
+@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
+ 	select HAVE_ACPI_TABLES
+ 	select HAVE_ACPI_RESUME
+ 	select MAINBOARD_HAS_NATIVE_VGA_INIT
++	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
+ 	select H8_DOCK_EARLY_INIT
+ 	select HAVE_CMOS_DEFAULT
+ 	select INTEL_EDID
+-- 
+1.9.1
+
diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch
new file mode 100644
index 00000000..7757620a
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch
@@ -0,0 +1,30 @@
+From 519a5be5914a2949f93f4c2f76b22cf4e6102879 Mon Sep 17 00:00:00 2001
+From: Francis Rowe <info@gluglug.org.uk>
+Date: Sat, 11 Oct 2014 20:36:10 +0100
+Subject: [PATCH 17/22] lenovo/t60: Enable legacy brightness controls (native
+ graphics)
+
+Value obtained by reading BLC_PWM_CTL when running the VBIOS (option ROM).
+
+Change-Id: I95f634c5071f6d4bdd423819ce4e40985732761c
+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 a0ee7f9..43f570e 100644
+--- a/src/mainboard/lenovo/t60/devicetree.cb
++++ b/src/mainboard/lenovo/t60/devicetree.cb
+@@ -25,7 +25,7 @@ chip northbridge/intel/i945
+ 	register "gpu_hotplug" = "0x00000220"
+ 	register "gpu_lvds_use_spread_spectrum_clock" = "1"
+ 	register "gpu_lvds_is_dual_channel" = "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/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
new file mode 100644
index 00000000..70bf654a
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
@@ -0,0 +1,95 @@
+From a36e204862fc556c7d06cbc9c29f6b0a4df21287 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 18/22] NOTFORMERGE: ec/lenovo/h8:
+ wlan/trackpoint/touchpad/bluetooth/wwan
+
+Permanently enable them. Ignore configuration made by nvramtool.
+Almost every user will want all of these to be enabled, and those
+who would like them to be disabled would physically remove the
+relevant components from their machine anyway, or just not use
+them (in the case of the touchpad or trackpoint). So, why make it
+configurable in the first place? All it does is add confusion.
+
+The mind boggles.
+
+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 13b0483..b688e64 100644
+--- a/src/ec/lenovo/h8/h8.c
++++ b/src/ec/lenovo/h8/h8.c
+@@ -245,9 +245,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);
+@@ -255,14 +257,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 f67fbda..9cb7149 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
+