summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-06-07 13:34:24 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-06-07 13:34:24 (EDT)
commit2f2ad71f38978e58fea95d4c722ac2582e21beda (patch)
tree21e8c513c66db7164f27b19134791f1a64fd21d1
parentb8540d13f8788b6fa19398b9e2886ae243d1a777 (diff)
changelog: Switch to 1.1~rc1-1
And drop patch.
-rw-r--r--changelog5
-rw-r--r--patches/board_enable-Whitelist-several-ThinkPad-laptops.patch48
2 files changed, 3 insertions, 50 deletions
diff --git a/changelog b/changelog
index ac8f52e..ee08072 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,8 @@
-flashrom (1.0.1-1) trunk
+flashrom (1.1~rc1-1) trunk
* New upstream release.
- - Refresh board_enable laptop whitelist patches.
+ - Drop board_enable laptop whitelist patches (similar patch applied
+ upstream).
-- Patrick McDermott <patrick.mcdermott@libiquity.com> Fri, 07 Jun 2019 12:57:09 -0400
diff --git a/patches/board_enable-Whitelist-several-ThinkPad-laptops.patch b/patches/board_enable-Whitelist-several-ThinkPad-laptops.patch
deleted file mode 100644
index dade800..0000000
--- a/patches/board_enable-Whitelist-several-ThinkPad-laptops.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 8c7e78b9deaa550339940a2efd7bcaef03267751 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Fri, 26 Jan 2018 00:57:10 +0000
-Subject: board_enable: Whitelist several ThinkPad laptops
-
-Newly whitelisted laptops include:
-
-* ThinkPad R400
-* ThinkPad T500
-* ThinkPad W500
-* Libiquity Taurinus X200
-
-Change-Id: I772f8e109c56a5fd40f6b1aff0f592b915669c17
-Signed-off-by: Leah Rowe <leah@libreboot.org>
-Reviewed-on: https://review.coreboot.org/23781
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Nico Huber <nico.h@gmx.de>
-Reviewed-by: David Hendricks <david.hendricks@gmail.com>
----
- board_enable.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/board_enable.c b/board_enable.c
-index b6e17eff..f2952c70 100644
---- a/board_enable.c
-+++ b/board_enable.c
-@@ -2428,14 +2428,18 @@ 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},
-+ {0x8086, 0x2917, 0x17AA, 0x20F5, 0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad W500", NULL, NULL, P2, "IBM/Lenovo", "ThinkPad W500", 0, OK, p2_whitelist_laptop},
- {0x8086, 0x2917, 0x17AA, 0x20F5, 0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad X200", NULL, NULL, P2, "IBM/Lenovo", "ThinkPad X200", 0, OK, p2_whitelist_laptop},
- {0x8086, 0x3B07, 0x17AA, 0x2166, 0x8086, 0x3B30, 0x17AA, 0x2167, "^ThinkPad 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},
---
-cgit v1.2.1
-