flashrom: upgrade 1.5.1 -> 1.6.0

0002-meson-Add-options-pciutils-ftdi-usb.patch
refreshed for 1.6.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu 2025-07-30 17:54:23 +08:00 committed by Khem Raj
parent 7a2ce28842
commit d03d56c13e
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 9 additions and 10 deletions

View File

@ -1,7 +1,7 @@
From 3ea99c117aa4c7a3502c93e4e4df50b3623e46c3 Mon Sep 17 00:00:00 2001 From 5cf5fc64c6aab35b89b8cf7f69b84b6f5100d7a6 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com> From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Tue, 15 Oct 2024 10:42:05 +0200 Date: Tue, 15 Oct 2024 10:42:05 +0200
Subject: [PATCH 2/2] meson: Add options pciutils, ftdi, usb Subject: [PATCH] meson: Add options pciutils, ftdi, usb
The options have been dropped in favor of an array option called programmer. The options have been dropped in favor of an array option called programmer.
Since this doesn't integrate well into yocto add back the old options. Since this doesn't integrate well into yocto add back the old options.
@ -16,10 +16,10 @@ Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
2 files changed, 6 insertions(+), 3 deletions(-) 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 6c8d3d3..61b794d 100644 index 35feb33..b5bb722 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -150,9 +150,9 @@ systems_serial = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'da @@ -140,9 +140,9 @@ systems_serial = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'da
cpus_port_io = [ 'x86', 'x86_64' ] cpus_port_io = [ 'x86', 'x86_64' ]
@ -33,10 +33,10 @@ index 6c8d3d3..61b794d 100644
group_serial = get_option('programmer').contains('group_serial') group_serial = get_option('programmer').contains('group_serial')
group_jlink = get_option('programmer').contains('group_jlink') group_jlink = get_option('programmer').contains('group_jlink')
diff --git a/meson_options.txt b/meson_options.txt diff --git a/meson_options.txt b/meson_options.txt
index 87456a9..570b152 100644 index 2829cd1..0e9d769 100644
--- a/meson_options.txt --- a/meson_options.txt
+++ b/meson_options.txt +++ b/meson_options.txt
@@ -24,4 +24,7 @@ option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\Na @@ -26,6 +26,9 @@ option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\Na
option('delay_minimum_sleep_us', type : 'integer', min : 0, value : 100, 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.' 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.') + ' Larger values may perform better on machines with low timer resolution, at the cost of increased power.')
@ -44,6 +44,5 @@ index 87456a9..570b152 100644
+option('usb', type : 'boolean', value : false, description : 'Select programmer group usb') +option('usb', type : 'boolean', value : false, description : 'Select programmer group usb')
+option('ftdi', type : 'boolean', value : false, description : 'Select programmer group ftdi') +option('ftdi', type : 'boolean', value : false, description : 'Select programmer group ftdi')
option('rpmc', type : 'feature', value : 'auto', description : 'Support for Replay Protected Monotonic Counter (RPMC) commands as specified by JESD260') option('rpmc', type : 'feature', value : 'auto', description : 'Support for Replay Protected Monotonic Counter (RPMC) commands as specified by JESD260')
-- option('log_message_length_limit', type : 'integer', min : 64, max : 1024, value : 256,
2.43.0 description : 'Log message length limit for v2 logging API')

View File

@ -7,7 +7,7 @@ SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.xz \
file://0002-meson-Add-options-pciutils-ftdi-usb.patch \ file://0002-meson-Add-options-pciutils-ftdi-usb.patch \
" "
SRC_URI[sha256sum] = "1f934b076ed49eace203655ec249fc7861a6b8e87fe4aef732e47b6e485b6293" SRC_URI[sha256sum] = "8b9db3987df9b5fc81e70189d017905dd5f6be1e1410347f22687ab6d4c94423"
S = "${UNPACKDIR}/flashrom-v${PV}" S = "${UNPACKDIR}/flashrom-v${PV}"