From b8ef9d9b120526ea7156b7d5f7cf1ef9494eb729 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Fri, 11 Mar 2016 01:52:41 -0500 Subject: Update flashrom to revision 99b2468c9eaa97f7209ee919aa254ba536fd84c2 --- diff --git a/resources/flashrom/patch/0001-New-laptops-whitelisted-ThinkPad-R400-and-ThinkPad-T.patch b/resources/flashrom/patch/0001-New-laptops-whitelisted-ThinkPad-R400-and-ThinkPad-T.patch new file mode 100644 index 0000000..319eaf6 --- /dev/null +++ b/resources/flashrom/patch/0001-New-laptops-whitelisted-ThinkPad-R400-and-ThinkPad-T.patch @@ -0,0 +1,28 @@ +From 52a0b55c77635dc026793e66d516e3aed335706a Mon Sep 17 00:00:00 2001 +From: Francis Rowe +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/resources/flashrom/patch/0001-Add-board-enable-for-Libiquity-Taurinus-X200.patch b/resources/flashrom/patch/0002-Add-whitelist-for-Taurinus-X200-laptop.patch index 3037b7a..6f471b5 100644 --- a/resources/flashrom/patch/0001-Add-board-enable-for-Libiquity-Taurinus-X200.patch +++ b/resources/flashrom/patch/0002-Add-whitelist-for-Taurinus-X200-laptop.patch @@ -1,18 +1,17 @@ -From d4179b662170543bf78e09431e3b880222d324dd Mon Sep 17 00:00:00 2001 -From: "Patrick \"P. J.\" McDermott" -Date: Thu, 11 Jun 2015 07:00:08 -0400 -Subject: [PATCH] Add board enable for Libiquity Taurinus X200 +From b1828512abf58911cfb829cb6a98d4e8dbefadc2 Mon Sep 17 00:00:00 2001 +From: Francis Rowe +Date: Fri, 11 Mar 2016 06:38:39 +0000 +Subject: [PATCH 1/1] Add whitelist for Taurinus X200 laptop -Signed-off-by: Patrick "P. J." McDermott --- board_enable.c | 1 + 1 file changed, 1 insertion(+) diff --git a/board_enable.c b/board_enable.c -index 31984e3..640d392 100644 +index 1d56203..a71061c 100644 --- a/board_enable.c +++ b/board_enable.c -@@ -2433,6 +2433,7 @@ const struct board_match board_matches[] = { +@@ -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}, @@ -21,5 +20,5 @@ index 31984e3..640d392 100644 {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}, -- -2.1.4 +1.9.1 diff --git a/resources/flashrom/patch/purged_chips.diff b/resources/flashrom/patch/0003-purged-chips.patch index b7c45be..d363ee5 100644 --- a/resources/flashrom/patch/purged_chips.diff +++ b/resources/flashrom/patch/0003-purged-chips.patch @@ -1,8 +1,17 @@ +From 260f0e096b385c9f53e9a28e79293131a11122a6 Mon Sep 17 00:00:00 2001 +From: Francis Rowe +Date: Fri, 11 Mar 2016 06:50:50 +0000 +Subject: [PATCH 1/1] purged chips + +--- + flashchips.c | 303 ----------------------------------------------------------- + 1 file changed, 303 deletions(-) + diff --git a/flashchips.c b/flashchips.c -index c722a64..4124023 100644 +index 0fc1b7a..5c94304 100644 --- a/flashchips.c +++ b/flashchips.c -@@ -7038,80 +7038,6 @@ const struct flashchip flashchips[] = { +@@ -7451,80 +7451,6 @@ const struct flashchip flashchips[] = { { .vendor = "Macronix", @@ -83,7 +92,7 @@ index c722a64..4124023 100644 .name = "MX25L1605D/MX25L1608D/MX25L1673E", .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, -@@ -7219,41 +7145,6 @@ const struct flashchip flashchips[] = { +@@ -7632,41 +7558,6 @@ const struct flashchip flashchips[] = { { .vendor = "Macronix", @@ -125,7 +134,7 @@ index c722a64..4124023 100644 .name = "MX25L3205D/MX25L3208D", .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, -@@ -7290,84 +7181,6 @@ const struct flashchip flashchips[] = { +@@ -7703,84 +7594,6 @@ const struct flashchip flashchips[] = { { .vendor = "Macronix", @@ -176,7 +185,7 @@ index c722a64..4124023 100644 - .page_size = 256, - /* OTP: 64B total; enter 0xB1, exit 0xC1 */ - .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -- .tested = TEST_UNTESTED, +- .tested = TEST_OK_PREW, - .probe = probe_spi_rdid, - .probe_timing = TIMING_ZERO, - .block_erasers = @@ -210,7 +219,7 @@ index c722a64..4124023 100644 .name = "MX25L3235D", .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, -@@ -7404,42 +7217,6 @@ const struct flashchip flashchips[] = { +@@ -7817,42 +7630,6 @@ const struct flashchip flashchips[] = { { .vendor = "Macronix", @@ -253,7 +262,7 @@ index c722a64..4124023 100644 .name = "MX25L6405D", .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, -@@ -7476,86 +7253,6 @@ const struct flashchip flashchips[] = { +@@ -7889,86 +7666,6 @@ const struct flashchip flashchips[] = { { .vendor = "Macronix", @@ -340,3 +349,6 @@ index c722a64..4124023 100644 .name = "MX25L12805D", .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, +-- +1.9.1 + diff --git a/resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff b/resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff deleted file mode 100644 index 63dad51..0000000 --- a/resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/board_enable.c b/board_enable.c -index 31984e3..aca7523 100644 ---- a/board_enable.c -+++ b/board_enable.c -@@ -2429,7 +2429,10 @@ const struct board_match board_matches[] = { - {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 X200$", NULL, NULL, P2, "IBM/Lenovo", "ThinkPad X200", 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, 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, 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}, diff --git a/resources/scripts/helpers/download/flashrom b/resources/scripts/helpers/download/flashrom index 99e9b02..29a0739 100755 --- a/resources/scripts/helpers/download/flashrom +++ b/resources/scripts/helpers/download/flashrom @@ -39,26 +39,26 @@ rm -Rf "flashrom/" # download it using git git clone https://github.com/stefanct/flashrom.git +( cd "flashrom/" # reset to known revision -git reset --hard 80c9382948afa5e572854d49846a36b7f9d90e03 +git reset --hard 99b2468c9eaa97f7209ee919aa254ba536fd84c2 # Apply patches # ------------------------------------------------------------------------------ printf "Enabling whitelist for X200S, X200 Tablet, T400, T500 and R400\n" -patch "board_enable.c" < "../resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff" +git am "../resources/flashrom/patch/0001-New-laptops-whitelisted-ThinkPad-R400-and-ThinkPad-T.patch" printf "Enabling whitelist for Libiquity Taurinus X200\n" -patch "board_enable.c" < "../resources/flashrom/patch/0001-Add-board-enable-for-Libiquity-Taurinus-X200.patch" +git am "../resources/flashrom/patch/0002-Add-whitelist-for-Taurinus-X200-laptop.patch" # Remove redundant definitions for the flash chips that # supported libreboot systems use. This removes the need # for the user to run with the "-c" argument on these systems printf "Patching flashchips.c to remove the redundant entries\n" -patch "flashchips.c" < "../resources/flashrom/patch/purged_chips.diff" - -cd "../" +git am "../resources/flashrom/patch/0003-purged-chips.patch" +) printf "\n\n" -- cgit v0.9.1