Merge branch 'update-patches' of and_who/libreboot into master

13 files changed, 13 insertions, 89 deletions

diff --git a/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch b/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch
index 6fd53217..24964bb4 100644
--- a/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch
+++ b/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch
@@ -1,6 +1,6 @@
-From c47f1f9e3b5d1a77b5261ad7cb7538c384828487 Mon Sep 17 00:00:00 2001
+From b403ddd709578d11f1e6d32abfc94701f57cae16 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
-Date: Thu, 21 Dec 2017 18:05:33 -0500
+Date: Thu, 25 Jan 2018 17:31:55 -0500
 Subject: [PATCH] Avoid using git submodules for 3rdparty
 
 This gets rid of git submodules entirely, to avoid the nuisance caused
@@ -59,11 +59,11 @@ index b118723..0000000
 -Subproject commit b1187232fdf819586ba8c8ece4a27a7515cbdc6d
 diff --git a/3rdparty/blobs b/3rdparty/blobs
 deleted file mode 160000
-index d2e558a..0000000
+index 8eb92ba..0000000
 --- a/3rdparty/blobs
 +++ /dev/null
 @@ -1 +0,0 @@
--Subproject commit d2e558a81f95f7b9149bea6b8362bb43ade82584
+-Subproject commit 8eb92ba947e171df11b3c62f5f257ce69b9e2d55
 diff --git a/3rdparty/chromeec b/3rdparty/chromeec
 deleted file mode 160000
 index 9fb1038..0000000
diff --git a/projects/cros-ec/configs/nyan/revision b/projects/cros-ec/configs/nyan/revision
index ec6fe7d9..6ce6b84b 100644
--- a/projects/cros-ec/configs/nyan/revision
+++ b/projects/cros-ec/configs/nyan/revision
@@ -1 +1 @@
-origin/release-R63-10032.B
+origin/release-R65-10323.B
diff --git a/projects/cros-ec/configs/veyron/revision b/projects/cros-ec/configs/veyron/revision
index ec6fe7d9..6ce6b84b 100644
--- a/projects/cros-ec/configs/veyron/revision
+++ b/projects/cros-ec/configs/veyron/revision
@@ -1 +1 @@
-origin/release-R63-10032.B
+origin/release-R65-10323.B
diff --git a/projects/depthcharge/configs/revision b/projects/depthcharge/configs/revision
index ec6fe7d9..6ce6b84b 100644
--- a/projects/depthcharge/configs/revision
+++ b/projects/depthcharge/configs/revision
@@ -1 +1 @@
-origin/release-R63-10032.B
+origin/release-R65-10323.B
diff --git a/projects/flashmap/configs/revision b/projects/flashmap/configs/revision
index ec6fe7d9..6ce6b84b 100644
--- a/projects/flashmap/configs/revision
+++ b/projects/flashmap/configs/revision
@@ -1 +1 @@
-origin/release-R63-10032.B
+origin/release-R65-10323.B
diff --git a/projects/flashrom-cros/configs/revision b/projects/flashrom-cros/configs/revision
index ec6fe7d9..6ce6b84b 100644
--- a/projects/flashrom-cros/configs/revision
+++ b/projects/flashrom-cros/configs/revision
@@ -1 +1 @@
-origin/release-R63-10032.B
+origin/release-R65-10323.B
diff --git a/projects/flashrom/patches/0001-New-laptops-whitelisted-ThinkPad-R400-and-ThinkPad-T.patch b/projects/flashrom/patches/0001-New-laptops-whitelisted-ThinkPad-R400-and-ThinkPad-T.patch
deleted file mode 100644
index f9d51806..00000000
--- a/projects/flashrom/patches/0001-New-laptops-whitelisted-ThinkPad-R400-and-ThinkPad-T.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 52a0b55c77635dc026793e66d516e3aed335706a Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Fri, 11 Mar 2016 06:35:03 +0000
-Subject: [PATCH 1/1] New laptops whitelisted: ThinkPad R400 and ThinkPad T500
-
-Support for these laptops was merged in coreboot a while ago, so it makes sense
-for flashrom to whitelist them.
----
- board_enable.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/board_enable.c b/board_enable.c
-index 7b152d1..1d56203 100644
---- a/board_enable.c
-+++ b/board_enable.c
-@@ -2427,7 +2427,9 @@ const struct board_match board_matches[] = {
- 	{0x8086, 0x7190,      0,      0,  0x8086, 0x7110,      0,      0, "^SE440BX-2$", NULL, NULL,          P3, "Intel",       "SE440BX-2",             0,   NT, intel_piix4_gpo27_lower},
- 	{0x1022, 0x7468,      0,      0,  0x1022, 0x7460,      0,      0, NULL,         "iwill", "dk8_htx",   P3, "IWILL",       "DK8-HTX",               0,   OK, w83627hf_gpio24_raise_2e},
- 	{0x8086, 0x27A0, 0x8086, 0x27a0,  0x8086, 0x27b8, 0x8086, 0x27b8, NULL,        "kontron", "986lcd-m", P3, "Kontron",     "986LCD-M",              0,   OK, board_kontron_986lcd_m},
-+    {0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad R400", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad R400",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad T400", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad T400",         0,   OK, p2_whitelist_laptop},
-+    {0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad T500", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad T500",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x1E22, 0x17AA, 0x21F6,  0x8086, 0x1E55, 0x17AA, 0x21F6, "^ThinkPad T530", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad T530",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x27a0, 0x17aa, 0x2015,  0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad T60",          0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x27a0, 0x17aa, 0x2017,  0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad T60(s)",       0,   OK, p2_whitelist_laptop},
--- 
-1.9.1
-
diff --git a/projects/flashrom/patches/0002-Add-whitelist-for-Taurinus-X200-laptop.patch b/projects/flashrom/patches/0002-Add-whitelist-for-Taurinus-X200-laptop.patch
deleted file mode 100644
index 0aa0701b..00000000
--- a/projects/flashrom/patches/0002-Add-whitelist-for-Taurinus-X200-laptop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b1828512abf58911cfb829cb6a98d4e8dbefadc2 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Fri, 11 Mar 2016 06:38:39 +0000
-Subject: [PATCH 1/1] Add whitelist for Taurinus X200 laptop
-
----
- board_enable.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/board_enable.c b/board_enable.c
-index 1d56203..a71061c 100644
---- a/board_enable.c
-+++ b/board_enable.c
-@@ -2437,6 +2437,7 @@ const struct board_match board_matches[] = {
- 	{0x8086, 0x3B07, 0x17AA, 0x2166,  0x8086, 0x3B30, 0x17AA, 0x2167, "^Lenovo X201", NULL, NULL,         P2, "IBM/Lenovo",  "ThinkPad X201",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x1E22, 0x17AA, 0x21FA,  0x8086, 0x1E55, 0x17AA, 0x21FA, "^ThinkPad X230", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad X230",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x27A0, 0x17AA, 0x2017,  0x8086, 0x27B9, 0x17AA, 0x2009, "^ThinkPad X60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad X60(s)",       0,   OK, p2_whitelist_laptop},
-+	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^Taurinus X200", "Libiquity", "Taurinus X200", P2, "Libiquity", "ThinkPad X200", 0, OK, p2_whitelist_laptop},
- 	{0x8086, 0x2411, 0x8086, 0x2411,  0x8086, 0x7125, 0x0e11, 0xb165, NULL,         NULL, NULL,           P3, "Mitac",       "6513WU",                0,   OK, board_mitac_6513wu},
- 	{0x8086, 0x8186, 0x8086, 0x8186,  0x8086, 0x8800,      0,      0, "^MSC Vertriebs GmbH$", NULL, NULL, P2, "MSC",         "Q7-TCTC",               0,   OK, p2_not_a_laptop},
- 	{0x8086, 0x7190,      0,      0,  0x8086, 0x7110,      0,      0, "^MS-6163 (i440BX)$", NULL, NULL,   P3, "MSI",         "MS-6163 (MS-6163 Pro)", 0,   OK, intel_piix4_gpo14_raise},
--- 
-1.9.1
-
diff --git a/projects/flashrom/patches/0004-Whitelist-ThinkPad-W500.patch b/projects/flashrom/patches/0004-Whitelist-ThinkPad-W500.patch
deleted file mode 100644
index bb1c2bc3..00000000
--- a/projects/flashrom/patches/0004-Whitelist-ThinkPad-W500.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8c970dcf19661bc3d128a10e3ca79c24b4479186 Mon Sep 17 00:00:00 2001
-From: Gauvain Roussel-Tarbouriech <govanify@protonmail.com>
-Date: Sat, 29 Apr 2017 19:01:11 +0200
-Subject: [PATCH 1/1] Whitelist ThinkPad W500
-
----
- board_enable.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/board_enable.c b/board_enable.c
-index fc99615..a418e4f 100644
---- a/board_enable.c
-+++ b/board_enable.c
-@@ -2430,6 +2430,7 @@ const struct board_match board_matches[] = {
-     {0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad R400", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad R400",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad T400", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad T400",         0,   OK, p2_whitelist_laptop},
-     {0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad T500", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad T500",         0,   OK, p2_whitelist_laptop},
-+	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad W500", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad W500",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x1E22, 0x17AA, 0x21F6,  0x8086, 0x1E55, 0x17AA, 0x21F6, "^ThinkPad T530", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad T530",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x27a0, 0x17aa, 0x2015,  0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad T60",          0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x27a0, 0x17aa, 0x2017,  0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad T60(s)",       0,   OK, p2_whitelist_laptop},
--- 
-2.12.2
-
diff --git a/projects/hdctools/configs/revision b/projects/hdctools/configs/revision
index ec6fe7d9..6ce6b84b 100644
--- a/projects/hdctools/configs/revision
+++ b/projects/hdctools/configs/revision
@@ -1 +1 @@
-origin/release-R63-10032.B
+origin/release-R65-10323.B
diff --git a/projects/mosys/configs/revision b/projects/mosys/configs/revision
index ec6fe7d9..6ce6b84b 100644
--- a/projects/mosys/configs/revision
+++ b/projects/mosys/configs/revision
@@ -1 +1 @@
-origin/release-R63-10032.B
+origin/release-R65-10323.B
diff --git a/projects/vboot/configs/revision b/projects/vboot/configs/revision
index ec6fe7d9..6ce6b84b 100644
--- a/projects/vboot/configs/revision
+++ b/projects/vboot/configs/revision
@@ -1 +1 @@
-origin/release-R63-10032.B
+origin/release-R65-10323.B
diff --git a/projects/vpd/configs/revision b/projects/vpd/configs/revision
index ec6fe7d9..6ce6b84b 100644
--- a/projects/vpd/configs/revision
+++ b/projects/vpd/configs/revision
@@ -1 +1 @@
-origin/release-R63-10032.B
+origin/release-R65-10323.B