@@ -1,4 +1,4 @@
-From 5cf5fc64c6aab35b89b8cf7f69b84b6f5100d7a6 Mon Sep 17 00:00:00 2001
+From 2f57f3797d08b435cac9cda79a7c6b7a978cdb8a Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Tue, 15 Oct 2024 10:42:05 +0200
Subject: [PATCH] meson: Add options pciutils, ftdi, usb
@@ -16,10 +16,10 @@ Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
-index 35feb33..b5bb722 100644
+index 876ecd9..5d656c9 100644
--- a/meson.build
+++ b/meson.build
-@@ -140,9 +140,9 @@ systems_serial = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'da
+@@ -134,9 +134,9 @@ systems_serial = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'da
cpus_port_io = [ 'x86', 'x86_64' ]
@@ -33,10 +33,10 @@ index 35feb33..b5bb722 100644
group_serial = get_option('programmer').contains('group_serial')
group_jlink = get_option('programmer').contains('group_jlink')
diff --git a/meson_options.txt b/meson_options.txt
-index 2829cd1..0e9d769 100644
+index bb09014..7cbf7bc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
-@@ -26,6 +26,9 @@ option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\Na
+@@ -23,6 +23,9 @@ option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\Na
option('delay_minimum_sleep_us', type : 'integer', min : 0, value : 100,
description : 'Minimum time in microseconds to suspend execution for (rather than polling) when a delay is required.'
+ ' Larger values may perform better on machines with low timer resolution, at the cost of increased power.')
deleted file mode 100644
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 23 Jun 2026 00:00:00 +0000
-Subject: [PATCH] cli_classic: Initialize time_start/time_end
-
-clang's -Wsometimes-uninitialized (promoted to an error via -Werror)
-flags that time_start may be used uninitialized at the function's "out:"
-label. Several early "goto out" paths execute before time(&time_start)
-runs, and the cleanup code calls difftime(time_end, time_start)
-unconditionally. Initialize both time_t variables at declaration so the
-value passed to difftime is always well defined.
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- cli_classic.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cli_classic.c b/cli_classic.c
-index 1234567..89abcde 100644
---- a/cli_classic.c
-+++ b/cli_classic.c
-@@ -1055,7 +1055,7 @@ int main(int argc, char *argv[])
- int ret = 0;
- int all_matched_count = 0;
- const char **all_matched_names = NULL;
-- time_t time_start, time_end;
-+ time_t time_start = 0, time_end = 0;
-
- struct flashctx *context = NULL; /* holds the active detected chip and other info */
- ret = flashrom_create_context(&context);
---
-2.43.0
similarity index 81%
rename from meta-oe/recipes-bsp/flashrom/flashrom_1.7.0.bb
rename to meta-oe/recipes-bsp/flashrom/flashrom_1.8.0.bb
@@ -5,10 +5,9 @@ HOMEPAGE = "http://flashrom.org"
LIC_FILES_CHKSUM = "file://COPYING.rst;md5=c0d58714ca15beeaed5b44a38116e133"
SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.xz \
file://0002-meson-Add-options-pciutils-ftdi-usb.patch \
- file://0003-cli_classic-Initialize-time_start-time_end.patch \
"
-SRC_URI[sha256sum] = "4328ace9833f7efe7c334bdd73482cde8286819826cc00149e83fba96bf3ab4f"
+SRC_URI[sha256sum] = "654c9c61745c250cd3b5ccd0e56fc43ee76980f92a5e078420420639d66975a2"
S = "${UNPACKDIR}/flashrom-v${PV}"
Upgrade to release 1.8.0: - Repeated reads --read-repeated[=<count>] [<file>]: Read the flash chip multiple times (default: 3, minimum: 3) and use majority voting to detect unstable connections. Deduplicates read results to minimise memory usage. If a file is given and a strict majority is found, saves the majority content to it. Useful for diagnosing flaky SPI wiring or unreliable programmers. - Bugs fixed Internal programmer no longer exits when ECAM is unavailable On Intel PCH100+ systems the flash enable code opens a second libpci accessor with PCI_ACCESS_ECAM. Mapping the ECAM region requires access to a physical range the kernel commonly reserves for a driver (PNP0C02), which CONFIG_IO_STRICT_DEVMEM denies. libpci reports this through its error handler, which by contract does not return and by default terminates the process, so flashrom died with: pcilib: Cannot map ecam region: Operation not permitted. before probing anything, with no command line option to work around it. Every kernel built with CONFIG_IO_STRICT_DEVMEM=y was affected, which is the default in most distributions. An ECAM initialisation failure is now caught and the 0xcf8/0xcfc port I/O access is used instead. ECAM is still tried first, so machines that need it keep using it. Remove 0003-cli_classic-Initialize-time_start-time_end.patch because the patch has been merged in the upstream. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- ...-meson-Add-options-pciutils-ftdi-usb.patch | 10 +++--- ...assic-Initialize-time_start-time_end.patch | 34 ------------------- .../{flashrom_1.7.0.bb => flashrom_1.8.0.bb} | 3 +- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0003-cli_classic-Initialize-time_start-time_end.patch rename meta-oe/recipes-bsp/flashrom/{flashrom_1.7.0.bb => flashrom_1.8.0.bb} (81%)