diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch index b1dd5d0773..c79384dd5b 100644 --- a/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch +++ b/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch @@ -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 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 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.') diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0003-cli_classic-Initialize-time_start-time_end.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0003-cli_classic-Initialize-time_start-time_end.patch deleted file mode 100644 index 34539ada96..0000000000 --- a/meta-oe/recipes-bsp/flashrom/flashrom/0003-cli_classic-Initialize-time_start-time_end.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- - 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 diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.7.0.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.8.0.bb 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 index bc9645f97a..25e3180ba0 100644 --- a/meta-oe/recipes-bsp/flashrom/flashrom_1.7.0.bb +++ b/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}"