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.

3 files changed, 0 insertions, 126 deletions

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