Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/73263 )
Change subject: meson: find libftdi1 also as libftdi with pkg-config
......................................................................
meson: find libftdi1 also as libftdi with pkg-config
On some systems the libftdi1 is known only as libftdi. Extend the meson
dependency call so that it searches for libftdi1 and libftdi. Add a
minimum required version to not get the original libftdi, which was
version 0.2 at highest.
The update to meson >=0.60.0 is required to use multiple names for a
dependency.
https://mesonbuild.com/Reference-manual_functions.html#dependency
Change-Id: I48d72f06c6a43e27c7370207f111292fe2ba63f9
Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com>
---
M meson.build
1 file changed, 21 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/63/73263/1
diff --git a/meson.build b/meson.build
index baa1084..1796a4e 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('flashromutils', 'c',
version : run_command('util/getversion.sh', '--version', check : true).stdout().strip(),
license : 'GPL-2.0',
- meson_version : '>=0.53.0',
+ meson_version : '>=0.60.0',
default_options : [
'warning_level=2',
'c_std=c99',
@@ -126,7 +126,7 @@
libpci = dependency('libpci', required : group_pci, static : (host_machine.system() == 'openbsd' ? true : false)) # On openbsd a static version of libpci is needed to get also -libz
libusb1 = dependency('libusb-1.0', required : group_usb)
-libftdi1 = dependency('libftdi1', required : group_ftdi)
+libftdi1 = dependency('libftdi1', 'libftdi', version : '>=1.0', required : group_ftdi)
libjaylink = dependency('libjaylink', required : group_jlink)
subdir('platform')
--
To view, visit https://review.coreboot.org/c/flashrom/+/73263
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I48d72f06c6a43e27c7370207f111292fe2ba63f9
Gerrit-Change-Number: 73263
Gerrit-PatchSet: 1
Gerrit-Owner: Thomas Heijligen <src(a)posteo.de>
Gerrit-MessageType: newchange
Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/73286 )
Change subject: libflashrom: Provide flashrom_flash_getname() API
......................................................................
libflashrom: Provide flashrom_flash_getname() API
The libflashom API exposes a API to get the flash size however
not the flash name.
Change-Id: I3dc32e261e6d54230d93f06b91f723811792112a
Signed-off-by: Edward O'Callaghan <quasisec(a)google.com>
---
M include/libflashrom.h
M libflashrom.c
2 files changed, 31 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/86/73286/1
diff --git a/include/libflashrom.h b/include/libflashrom.h
index 490ef03..fc8dd0e 100644
--- a/include/libflashrom.h
+++ b/include/libflashrom.h
@@ -230,6 +230,13 @@
*/
size_t flashrom_flash_getsize(const struct flashrom_flashctx *flashctx);
/**
+ * @brief Returns the name of the specified flash chip.
+ *
+ * @param flashctx The queried flash context.
+ * @param[out] allocated with a copy of the flash name string.
+ */
+void flashrom_flash_getname(const struct flashrom_flashctx *const flashctx, char **name);
+/**
* @brief Erase the specified ROM chip.
*
* If a layout is set in the given flash context, only included regions
diff --git a/libflashrom.c b/libflashrom.c
index 2e89fe5..50a7a0e 100644
--- a/libflashrom.c
+++ b/libflashrom.c
@@ -251,6 +251,17 @@
return flashctx->chip->total_size * 1024;
}
+void flashrom_flash_getname(const struct flashrom_flashctx *const flashctx, char **name)
+{
+ const char *chip_name = flashctx->chip->name;
+ const size_t len = strlen(chip_name) + 1;
+
+ if (!name) return;
+
+ *name = calloc(1, len);
+ strcpy(*name, chip_name);
+}
+
void flashrom_flash_release(struct flashrom_flashctx *const flashctx)
{
if (!flashctx)
--
To view, visit https://review.coreboot.org/c/flashrom/+/73286
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I3dc32e261e6d54230d93f06b91f723811792112a
Gerrit-Change-Number: 73286
Gerrit-PatchSet: 1
Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-MessageType: newchange
Attention is currently required from: Felix Singer, Evan Benn, Anastasia Klimchuk.
Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73175 )
Change subject: MAINTAINERS: flashrom_tester: Change email
......................................................................
Patch Set 1:
(1 comment)
File MAINTAINERS:
https://review.coreboot.org/c/flashrom/+/73175/comment/8ce5842b_84752a2b
PS1, Line 173: S: Supported
> Edward, do you think someone else can take this? Thank you!
I have no idea yet, certainly there is no obligation upon Evan. I am glad none the less to still be able to contact him to catch up for a drink sometime!
--
To view, visit https://review.coreboot.org/c/flashrom/+/73175
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ic1a53ddbc38e7d63f7b15aa2b31c63a5b65746f9
Gerrit-Change-Number: 73175
Gerrit-PatchSet: 1
Gerrit-Owner: Evan Benn <evanbenn(a)gmail.com>
Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net>
Gerrit-Attention: Evan Benn <evanbenn(a)gmail.com>
Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org>
Gerrit-Comment-Date: Sun, 26 Feb 2023 10:18:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Evan Benn <evanbenn(a)gmail.com>
Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org>
Gerrit-MessageType: comment
Attention is currently required from: Alexander Goncharov.
Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/72807 )
Change subject: ch341a_spi: Refactor singleton states into reentrant pattern
......................................................................
Patch Set 3: Code-Review+1
--
To view, visit https://review.coreboot.org/c/flashrom/+/72807
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I9fe72bff88b7f8778c1199bdab8ba43bf32e1c8c
Gerrit-Change-Number: 72807
Gerrit-PatchSet: 3
Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net>
Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org>
Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net>
Gerrit-Comment-Date: Sun, 26 Feb 2023 10:11:07 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Edward O'Callaghan.
Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73285 )
Change subject: jedec.c: Provide better lexical scope to itermediates
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://review.coreboot.org/c/flashrom/+/73285
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I8e01d471bb33a933b80760df2c69a4bf3589ba76
Gerrit-Change-Number: 73285
Gerrit-PatchSet: 1
Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Comment-Date: Sun, 26 Feb 2023 07:42:19 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Edward O'Callaghan.
Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73284 )
Change subject: jedec.c: Tidy up whitespace and line wraps
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://review.coreboot.org/c/flashrom/+/73284
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I3f18609709e59cdfc5a853c6e1ae5f53aecacc1a
Gerrit-Change-Number: 73284
Gerrit-PatchSet: 1
Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Comment-Date: Sun, 26 Feb 2023 07:40:24 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Edward O'Callaghan.
Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73283 )
Change subject: jedec.c: Add a little more const correctness
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://review.coreboot.org/c/flashrom/+/73283
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ic9a76ce3734bd83399c95478a7c0bfc081211124
Gerrit-Change-Number: 73283
Gerrit-PatchSet: 1
Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Comment-Date: Sun, 26 Feb 2023 07:39:55 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Edward O'Callaghan.
Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73282 )
Change subject: jedec.c: Rename func to jedec_write_page()
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://review.coreboot.org/c/flashrom/+/73282
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I1be83d5974e305bddceaa34b64e982b774ade0d2
Gerrit-Change-Number: 73282
Gerrit-PatchSet: 1
Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Comment-Date: Sun, 26 Feb 2023 07:39:22 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Edward O'Callaghan.
Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/72692 )
Change subject: jedec.c: Drop branching non-zero programmer_delay() operands
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://review.coreboot.org/c/flashrom/+/72692
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ic547669bb16e6ace4fe283e07345fc2d7075d63e
Gerrit-Change-Number: 72692
Gerrit-PatchSet: 2
Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Comment-Date: Sun, 26 Feb 2023 07:38:38 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment