May 2022 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: meson: relocate config_print_wiki & config_default_programmer_*
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/64029 ) Change subject: meson: relocate config_print_wiki & config_default_programmer_* ...................................................................... meson: relocate config_print_wiki & config_default_programmer_* Change-Id: I9538b0aee31b294844d4f4ca0396334a81dfb498 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/64029 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M meson.build 1 file changed, 13 insertions(+), 13 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/meson.build b/meson.build index 3742a1d..30ebb88 100644 --- a/meson.build +++ b/meson.build @@ -403,6 +403,19 @@ endif endif +if config_print_wiki + srcs += 'print_wiki.c' + cargs += '-DCONFIG_PRINT_WIKI=1' +endif + +if config_default_programmer_name != '' + cargs += '-DCONFIG_DEFAULT_PROGRAMMER_NAME=&programmer_' + config_default_programmer_name +else + cargs += '-DCONFIG_DEFAULT_PROGRAMMER_NAME=NULL' +endif + +cargs += '-DCONFIG_DEFAULT_PROGRAMMER_ARGS="' + config_default_programmer_args + '"' + install_headers([ 'include/libflashrom.h', ], @@ -465,19 +478,6 @@ dependencies : deps ) -if config_print_wiki - srcs += 'print_wiki.c' - cargs += '-DCONFIG_PRINT_WIKI=1' -endif - -if config_default_programmer_name != '' - cargs += '-DCONFIG_DEFAULT_PROGRAMMER_NAME=&programmer_' + config_default_programmer_name -else - cargs += '-DCONFIG_DEFAULT_PROGRAMMER_NAME=NULL' -endif - -cargs += '-DCONFIG_DEFAULT_PROGRAMMER_ARGS="' + config_default_programmer_args + '"' - # we can't just link_with libflashrom as we require all the internal symbols... executable( 'flashrom', 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/64029 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9538b0aee31b294844d4f4ca0396334a81dfb498 Gerrit-Change-Number: 64029 Gerrit-PatchSet: 5 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: meson: use built-in options for install paths
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/64028 ) Change subject: meson: use built-in options for install paths ...................................................................... meson: use built-in options for install paths The install functions of meson can take a relative path and join the prefix automatically. Change-Id: I9cb9faf4bdbcfd66098478cc3a260eb3b664a2e6 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/64028 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M meson.build 1 file changed, 2 insertions(+), 7 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/meson.build b/meson.build index a783bdd..3742a1d 100644 --- a/meson.build +++ b/meson.build @@ -403,11 +403,6 @@ endif endif -prefix = get_option('prefix') -sbindir = join_paths(prefix, get_option('sbindir')) -libdir = join_paths(prefix, get_option('libdir')) -mandir = join_paths(prefix, get_option('mandir')) - install_headers([ 'include/libflashrom.h', ], @@ -461,7 +456,7 @@ output : 'flashrom.8', configuration : conf, install: true, - install_dir: join_paths(mandir, 'man8'), + install_dir: join_paths(get_option('mandir'), 'man8'), ) flashrom_dep = declare_dependency( @@ -501,7 +496,7 @@ cargs ], install : true, - install_dir : sbindir, + install_dir : get_option('sbindir') ) subdir('util') 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/64028 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9cb9faf4bdbcfd66098478cc3a260eb3b664a2e6 Gerrit-Change-Number: 64028 Gerrit-PatchSet: 5 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: meson: add option to disable tests
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63832 ) Change subject: meson: add option to disable tests ...................................................................... meson: add option to disable tests During development it can be useful to disable unit testing. By default tests are built if cmocka is found. To force enable tests run `meson build -Dtests=enable`. To disable tests run `meson build -Dtests=disabled`. Change-Id: I384c904c577b265dfe36bf46bf07c641bc29de9b Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63832 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M meson.build M meson_options.txt 2 files changed, 29 insertions(+), 23 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/meson.build b/meson.build index f9a0455..a783bdd 100644 --- a/meson.build +++ b/meson.build @@ -506,30 +506,35 @@ subdir('util') +# Use `.auto() or .enabled()` instead of `.allowed()` to keep the minimum meson version as low as possible. +# `.allowed()` gets introduced in 0.59.0 +if get_option('tests').auto() or get_option('tests').enabled() # unit-test framework cmocka_dep = dependency( - 'cmocka', - fallback: ['cmocka', 'cmocka_dep'], - required: false -) -flashrom_test_dep = declare_dependency( - include_directories : include_dir, - sources : [ - srcs, - 'cli_common.c', - 'cli_output.c', - 'flashrom.c', - ], - compile_args : [ - '-includestdlib.h', - '-includeunittest_env.h', - '-includehwaccess_x86_io_unittest.h' - ], - dependencies : [ - deps, - ], -) + 'cmocka', + fallback: ['cmocka', 'cmocka_dep'], + required : get_option('tests') + ) -if cmocka_dep.found() - subdir('tests') + flashrom_test_dep = declare_dependency( + include_directories : include_dir, + sources : [ + srcs, + 'cli_common.c', + 'cli_output.c', + 'flashrom.c', + ], + compile_args : [ + '-includestdlib.h', + '-includeunittest_env.h', + '-includehwaccess_x86_io_unittest.h' + ], + dependencies : [ + deps, + ], + ) + + if cmocka_dep.found() + subdir('tests') + endif endif diff --git a/meson_options.txt b/meson_options.txt index 8022c74..46ac763 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -42,3 +42,4 @@ option('config_lspcon_i2c_spi', type : 'boolean', value : false, description : 'Parade lspcon USB-C to HDMI protocol translator') option('config_mediatek_i2c_spi', type : 'boolean', value : false, description : 'MediaTek LCD controller') option('config_realtek_mst_i2c_spi', type : 'boolean', value : true, description : 'Realtek MultiStream Transport MST') +option('tests', type : 'feature', value : 'auto', description : 'Build unit tests') 8 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/63832 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I384c904c577b265dfe36bf46bf07c641bc29de9b Gerrit-Change-Number: 63832 Gerrit-PatchSet: 10 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: meson: use `platform/` as subdir()
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63826 ) Change subject: meson: use `platform/` as subdir() ...................................................................... meson: use `platform/` as subdir() Move build instructions for files inside the `platform/` directory to `platform/meson.build`. This contains instructions to build `memaccess.c`, the right endian implementation and selecting the right legacy command line option for the endian. The `platform/` directory should contain code that abstracts the underlying platform but is not involved in flashrom logic. Change-Id: I88044a3f903f316138483dd872a6d95f8686ae69 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63826 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M meson.build A platform/meson.build 2 files changed, 13 insertions(+), 11 deletions(-) Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved diff --git a/meson.build b/meson.build index 56ff970..f9a0455 100644 --- a/meson.build +++ b/meson.build @@ -115,6 +115,8 @@ 'writeprotect_ranges.c', ) +subdir('platform') + host_is_x86 = ['x86', 'x86_64'].contains(host_machine.cpu_family()) need_serial = [ @@ -174,17 +176,6 @@ add_project_arguments('-DIS_WINDOWS=0', language : 'c') endif -srcs += 'platform/memaccess.c' - -if host_machine.endian() == 'little' - srcs += 'platform/endian_little.c' - add_project_arguments('-D__FLASHROM_LITTLE_ENDIAN__=1', language : 'c') -endif -if host_machine.endian() == 'big' - srcs += 'platform/endian_big.c' - add_project_arguments('-D__FLASHROM_BIG_ENDIAN__=1', language : 'c') -endif - # some programmers require libusb if get_option('usb') srcs += 'usbdev.c' diff --git a/platform/meson.build b/platform/meson.build new file mode 100644 index 0000000..5a74cef --- /dev/null +++ b/platform/meson.build @@ -0,0 +1,11 @@ +srcs += files( + ('endian_' + host_machine.endian() + '.c'), + 'memaccess.c', +) + +if host_machine.endian() == 'little' + add_project_arguments('-D__FLASHROM_LITTLE_ENDIAN__=1', language : 'c') +endif +if host_machine.endian() == 'big' + add_project_arguments('-D__FLASHROM_BIG_ENDIAN__=1', language : 'c') +endif 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/63826 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I88044a3f903f316138483dd872a6d95f8686ae69 Gerrit-Change-Number: 63826 Gerrit-PatchSet: 8 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Felix Singer <felixsinger(a)posteo.net> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: util/ich_descriptors_tool: Remove unneeded meson dependencies
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63757 ) Change subject: util/ich_descriptors_tool: Remove unneeded meson dependencies ...................................................................... util/ich_descriptors_tool: Remove unneeded meson dependencies Change-Id: Ice1437cb294729b6af0e24f0a02692459b7a1412 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63757 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M util/ich_descriptors_tool/meson.build 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved diff --git a/util/ich_descriptors_tool/meson.build b/util/ich_descriptors_tool/meson.build index 19097ee..80f4a52 100644 --- a/util/ich_descriptors_tool/meson.build +++ b/util/ich_descriptors_tool/meson.build @@ -4,9 +4,6 @@ 'ich_descriptors_tool.c', '../../ich_descriptors.c', ], - dependencies : [ - deps, - ], include_directories : include_dir, c_args : [ '-DICH_DESCRIPTORS_FROM_DUMP_ONLY', 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/63757 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ice1437cb294729b6af0e24f0a02692459b7a1412 Gerrit-Change-Number: 63757 Gerrit-PatchSet: 9 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: meson: relocate add_project_arguments() for IS_WINDOWS
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63827 ) Change subject: meson: relocate add_project_arguments() for IS_WINDOWS ...................................................................... meson: relocate add_project_arguments() for IS_WINDOWS Change-Id: I6afb65fabf858449f2706bf250588225a94c1871 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63827 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M meson.build 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/meson.build b/meson.build index 6b088f0..56ff970 100644 --- a/meson.build +++ b/meson.build @@ -36,12 +36,6 @@ add_project_arguments('-D_BSD_SOURCE', language : 'c') # required for glibc < v2.19 add_project_arguments('-DFLASHROM_VERSION="' + meson.project_version() + '"', language : 'c') -if host_machine.system() in ['cygwin', 'windows'] - add_project_arguments('-DIS_WINDOWS=1', language : 'c') -else - add_project_arguments('-DIS_WINDOWS=0', language : 'c') -endif - # get defaults from configure config_atahpt = get_option('config_atahpt') config_atapromise = get_option('config_atapromise') @@ -174,6 +168,11 @@ if cc.check_header('sys/utsname.h') add_project_arguments('-DHAVE_UTSNAME=1', language : 'c') endif +if host_machine.system() in ['cygwin', 'windows'] + add_project_arguments('-DIS_WINDOWS=1', language : 'c') +else + add_project_arguments('-DIS_WINDOWS=0', language : 'c') +endif srcs += 'platform/memaccess.c' 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/63827 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6afb65fabf858449f2706bf250588225a94c1871 Gerrit-Change-Number: 63827 Gerrit-PatchSet: 6 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: meson: relocate source file list
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/64026 ) Change subject: meson: relocate source file list ...................................................................... meson: relocate source file list Change-Id: I921be8a8a99b93d23c1dbd4ea54672ba9998558d Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/64026 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> --- M meson.build 1 file changed, 34 insertions(+), 34 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/meson.build b/meson.build index 222f7c1..6b088f0 100644 --- a/meson.build +++ b/meson.build @@ -86,7 +86,40 @@ cargs = [] deps = [] -srcs = [] +srcs = files( + '82802ab.c', + 'at45db.c', + 'bitbang_spi.c', + 'edi.c', + 'en29lv640b.c', + 'flashchips.c', + 'flashrom.c', + 'fmap.c', + 'helpers.c', + 'ich_descriptors.c', + 'jedec.c', + 'layout.c', + 'libflashrom.c', + 'opaque.c', + 'print.c', + 'programmer.c', + 'programmer_table.c', + 's25f.c', + 'sfdp.c', + 'spi25.c', + 'spi25_statusreg.c', + 'spi95.c', + 'spi.c', + 'sst28sf040.c', + 'sst49lfxxxc.c', + 'sst_fwhub.c', + 'stm50.c', + 'udelay.c', + 'w29ee011.c', + 'w39.c', + 'writeprotect.c', + 'writeprotect_ranges.c', +) host_is_x86 = ['x86', 'x86_64'].contains(host_machine.cpu_family()) @@ -392,39 +425,6 @@ include_dir = include_directories('include') -# core modules needed by both the library and the CLI -srcs += '82802ab.c' -srcs += 'at45db.c' -srcs += 'edi.c' -srcs += 'en29lv640b.c' -srcs += 'flashchips.c' -srcs += 'flashrom.c' -srcs += 'fmap.c' -srcs += 'helpers.c' -srcs += 'ich_descriptors.c' -srcs += 'jedec.c' -srcs += 'layout.c' -srcs += 'libflashrom.c' -srcs += 'opaque.c' -srcs += 'print.c' -srcs += 'programmer.c' -srcs += 'programmer_table.c' -srcs += 's25f.c' -srcs += 'sfdp.c' -srcs += 'spi25.c' -srcs += 'spi25_statusreg.c' -srcs += 'spi95.c' -srcs += 'spi.c' -srcs += 'sst28sf040.c' -srcs += 'sst49lfxxxc.c' -srcs += 'sst_fwhub.c' -srcs += 'stm50.c' -srcs += 'udelay.c' -srcs += 'w29ee011.c' -srcs += 'w39.c' -srcs += 'writeprotect.c' -srcs += 'writeprotect_ranges.c' - mapfile = 'libflashrom.map' vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile) flashrom = library( -- To view, visit https://review.coreboot.org/c/flashrom/+/64026 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I921be8a8a99b93d23c1dbd4ea54672ba9998558d Gerrit-Change-Number: 64026 Gerrit-PatchSet: 4 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: meson: relocate source file list
by Edward O'Callaghan (Code Review) 12 May '22

12 May '22

Attention is currently required from: Thomas Heijligen. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/64026 ) Change subject: meson: relocate source file list ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: > I think you can start merging the first part of the chain ;) seems like a big chunk is ready already […] +1 -- To view, visit https://review.coreboot.org/c/flashrom/+/64026 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I921be8a8a99b93d23c1dbd4ea54672ba9998558d Gerrit-Change-Number: 64026 Gerrit-PatchSet: 3 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Thu, 12 May 2022 08:32:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: util/flashrom_tester: Update sys-info crate to version 0.9
by Edward O'Callaghan (Code Review) 12 May '22

12 May '22

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63975 ) Change subject: util/flashrom_tester: Update sys-info crate to version 0.9 ...................................................................... util/flashrom_tester: Update sys-info crate to version 0.9 An issue was discovered in the sys-info crate before 0.8.0 for Rust. sys_info::disk_info calls can trigger a double free. To prevent any potential problems, update this crate to version 0.9 (as of writing, sys-info version 0.9.1 is the latest). Refer to CVE-2020-36434 for more details about the sys-info crate bug. TEST=Run `cargo build` in `util/flashrom_tester`, it still works fine. Change-Id: I3b6b21e830ff3107860f7bcbfe2d58b29efe0c12 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63975 Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Reviewed-by: Jack Rosenthal <jrosenth(a)chromium.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M util/flashrom_tester/Cargo.toml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Tim Wawrzynczak: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Jack Rosenthal: Looks good to me, but someone else must approve Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, but someone else must approve diff --git a/util/flashrom_tester/Cargo.toml b/util/flashrom_tester/Cargo.toml index e7a5820..8956b92 100644 --- a/util/flashrom_tester/Cargo.toml +++ b/util/flashrom_tester/Cargo.toml @@ -22,7 +22,7 @@ log = { version = "0.4", features = ["std"] } rand = "0.6.4" serde_json = "1" -sys-info = "0.5.7" +sys-info = "0.9" [build-dependencies] built = { version = "0.3", default-features = false, features = ["serialized_time", "serialized_version"] } -- To view, visit https://review.coreboot.org/c/flashrom/+/63975 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3b6b21e830ff3107860f7bcbfe2d58b29efe0c12 Gerrit-Change-Number: 63975 Gerrit-PatchSet: 3 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Evan Benn <evanbenn(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: tests: Rearange CPP guards
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/64224 ) Change subject: tests: Rearange CPP guards ...................................................................... Patch Set 2: (1 comment) File tests/lifecycle.c: https://review.coreboot.org/c/flashrom/+/64224/comment/a3f7fe5d_c679e6a8 PS2, Line 87: #if CONFIG_DUMMY == 1 > We could get rid of the pre-processor conditionals by splitting up the file into per-driver compilat […] Splitting the file is a good idea. I would be careful with the use of weak symbols. Sometimes they behave unexpectedly. As long as we have the CONFIG_* symbols we can also use them here. We could do the same as in programmer_table.c for the first step. Beside that I will not consider this as part of this change here. -- To view, visit https://review.coreboot.org/c/flashrom/+/64224 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I02880e73996b30df618738e86b8a52126fbe5b3b Gerrit-Change-Number: 64224 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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-Comment-Date: Thu, 12 May 2022 06:43:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit May 2022