Update to flashrom 1.1-rc1

flashrom-1.0-AT25DF021A.patch

@@ -1,80 +0,0 @@
-From 0b59b0dafc219ba73ee2af5404ce626575d74c6f Mon Sep 17 00:00:00 2001
-From: Steffen Mauch <steffen.mauch@gmail.com>
-Date: Sat, 2 Jun 2018 23:46:03 +0200
-Subject: [PATCH] Add support for AT25DF021A
-
-This is the low-voltage version of the AT25DF021. Tested with FT2232H
-Mini Module
-
-Change-Id: If4990e6856c8b77567ef4218459cf754b9c6bc57
-Signed-off-by: Steffen Mauch <steffen.mauch@gmail.com>
-Reviewed-on: https://review.coreboot.org/26856
-Reviewed-by: David Hendricks <david.hendricks@gmail.com>
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
----
- flashchips.c | 39 +++++++++++++++++++++++++++++++++++++++
- flashchips.h |  1 +
- 2 files changed, 40 insertions(+)
-
-diff --git a/flashchips.c b/flashchips.c
-index 9898fa777..17cb1b4b0 100644
---- a/flashchips.c
-+++ b/flashchips.c
-@@ -1517,6 +1517,45 @@ const struct flashchip flashchips[] = {
- 		.voltage	= {2700, 3600}, /* 2.3-3.6V & 2.7-3.6V models available */
- 	},
- 
-+	{
-+		.vendor		= "Atmel",
-+		.name		= "AT25DF021A",
-+		.bustype	= BUS_SPI,
-+		.manufacture_id	= ATMEL_ID,
-+		.model_id	= ATMEL_AT25DF021A,
-+		.total_size	= 256,
-+		.page_size	= 256,
-+		/* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */
-+		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP,
-+		.tested		= TEST_OK_PREW,
-+		.probe		= probe_spi_rdid,
-+		.probe_timing	= TIMING_ZERO,
-+		.block_erasers	=
-+		{
-+			{
-+				.eraseblocks = { {4 * 1024, 64} },
-+				.block_erase = spi_block_erase_20,
-+			}, {
-+				.eraseblocks = { {32 * 1024, 8} },
-+				.block_erase = spi_block_erase_52,
-+			}, {
-+				.eraseblocks = { {64 * 1024, 4} },
-+				.block_erase = spi_block_erase_d8,
-+			}, {
-+				.eraseblocks = { {256 * 1024, 1} },
-+				.block_erase = spi_block_erase_60,
-+			}, {
-+				.eraseblocks = { {256 * 1024, 1} },
-+				.block_erase = spi_block_erase_c7,
-+			}
-+		},
-+		.printlock	= spi_prettyprint_status_register_at25df,
-+		.unlock		= spi_disable_blockprotect_at2x_global_unprotect,
-+		.write		= spi_chip_write_256,
-+		.read		= spi_chip_read,
-+		.voltage	= {1650, 3600},
-+	},
-+
- 	{
- 		.vendor		= "Atmel",
- 		.name		= "AT25DF041A",
-diff --git a/flashchips.h b/flashchips.h
-index dfbda5d19..5dedb38e1 100644
---- a/flashchips.h
-+++ b/flashchips.h
-@@ -128,6 +128,7 @@
- 
- #define ATMEL_ID		0x1F	/* Atmel (now used by Adesto) */
- #define ATMEL_AT25DF021		0x4300
-+#define ATMEL_AT25DF021A	0x4301
- #define ATMEL_AT25DF041A	0x4401
- #define ATMEL_AT25DF081		0x4502	/* EDI 0x00. AT25DL081 has same ID + EDI 0x0100 */
- #define ATMEL_AT25DF081A	0x4501	/* Yes, 81A has a lower number than 81 */

flashrom.spec

@@ -1,13 +1,12 @@
 Summary:	Simple program for reading/writing flash chips content
 Name:		flashrom
-Version:	1.0.1
-Release:	1%{?dist}
+Version:	1.1
+Release:	0.1%{?dist}
 License:	GPLv2
 URL:		https://flashrom.org
 
-Source0:	https://download.flashrom.org/releases/%{name}-v%{version}.tar.bz2
+Source0:	https://download.flashrom.org/releases/%{name}-v%{version}-rc1.tar.bz2
 # https://github.com/flashrom/flashrom/commit/0b59b0dafc219ba73ee2af5404ce626575d74c6f
-Patch0:		%{name}-1.0-AT25DF021A.patch
 
 BuildRequires:	gcc
 BuildRequires:	pciutils-devel
@@ -34,8 +33,7 @@ other programmer devices.
 
 
 %prep
-%setup -q -n %{name}-v%{version}
-%patch0 -p1
+%setup -q -n %{name}-v%{version}-rc1
 # Replace GROUP="plugdev" specifiers with TAG+="uaccess"
 sed -e 's/MODE="[0-9]*", GROUP="plugdev"/TAG+="uaccess"/g' util/z60_flashrom.rules -i
 
@@ -66,6 +64,10 @@ install -D -p -m 0644 util/z60_flashrom.rules %{buildroot}/%{_udevrulesdir}/60_f
 
 
 %changelog
+* Mon May 27 2019 David Hendricks <david.hendricks@gmail.com> - 1.1-0.1
+- Update to flashrom 1.1-rc1
+- Drop flashrom-1.0-AT25DF021A.patch since it's been merged
+
 * Sun Apr 28 2019 Robert Scheck <robert@fedoraproject.org> - 1.0.1-1
 - Corrected package version from v1.0.1 to 1.0.1
 

sources

@@ -1 +1 @@
-SHA512 (flashrom-v1.0.1.tar.bz2) = 77332d8a8f22c38a2a1a306d8b6969e3e96082cd768dcc4f13de989a634b33813412ca1a939737f6c020b36743eaca87a2d46d071fe11f7b0d64efc80f6b8080
+SHA512 (flashrom-v1.1-rc1.tar.bz2) = c76339836c965fd285fbf33470f61a135da4561fef44be8958f17d44ba9caeb6eaab9a0aaf446725aa8deed28abdd46fc0480a64bcf09269f04502841a7b68da