- flashrom-gerrit - mail.coreboot.org

[S] Change in flashrom[master]: doc: Add build instructions for NI-845x on Windows
by Thomas Heijligen (Code Review) 15 May '23

15 May '23

Attention is currently required from: Anastasia Klimchuk. Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/75270 ) Change subject: doc: Add build instructions for NI-845x on Windows ...................................................................... doc: Add build instructions for NI-845x on Windows Change-Id: I97ad08632f35aa241b3d19d9ce7711146e3f1f4a Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M doc/dev_guide/building_from_source.rst 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/70/75270/1 diff --git a/doc/dev_guide/building_from_source.rst b/doc/dev_guide/building_from_source.rst index ffb58a7..98360f3 100644 --- a/doc/dev_guide/building_from_source.rst +++ b/doc/dev_guide/building_from_source.rst @@ -19,9 +19,11 @@ * libusb1** * libftdi1** * libjaylink** +* NI-845x driver & library package *** -| \* optional, for building unit testing -| \** optional, depending on the selected programmer +| \* optional, for building unit testing +| \** optional, depending on the selected programmer +| \*** optional, proprietary and Windows only. (See Windows build instructions) If you are cross compiling, install the dependencies for your target. @@ -85,6 +87,9 @@ Install `MSYS2 <https://www.msys2.org/>`_ and ensure it is `fully updated <https://www.msys2.org/docs/updating/>`_. * ``libpci`` is not available through the package manager and pci based programmer are not supported on Windows. + * ``ni845x_spi`` is only available with the proprietary library from National Instruments. Download and install the driver + from `ni.com <https://www.ni.com/en-us/support/downloads/drivers/download.ni-845x-driver-…>_` and build flashrom + for **32-bit**. Add ``-Dprogrammer=ni845x_spi`` to your meson configuration. In the MINGW64 shell run:: -- To view, visit https://review.coreboot.org/c/flashrom/+/75270 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I97ad08632f35aa241b3d19d9ce7711146e3f1f4a Gerrit-Change-Number: 75270 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: doc: Add Windows MSYS2 build instructions
by Thomas Heijligen (Code Review) 15 May '23

15 May '23

Attention is currently required from: Thomas Heijligen. Hello build bot (Jenkins), Angel Pons, Anastasia Klimchuk, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/75189 to look at the new patch set (#5). Change subject: doc: Add Windows MSYS2 build instructions ...................................................................... doc: Add Windows MSYS2 build instructions Change-Id: I847428535547242ff32af92c4fe8477241826814 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M doc/dev_guide/building_from_source.rst 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/89/75189/5 -- To view, visit https://review.coreboot.org/c/flashrom/+/75189 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I847428535547242ff32af92c4fe8477241826814 Gerrit-Change-Number: 75189 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: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: Makefile: Simplify the NI-845X detection
by Miklós Márton (Code Review) 15 May '23

15 May '23

Attention is currently required from: Miklós Márton, Thomas Heijligen. Miklós Márton has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/75234 ) Change subject: Makefile: Simplify the NI-845X detection ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Compiles finw with mingw. -- To view, visit https://review.coreboot.org/c/flashrom/+/75234 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2115c30d0884e35eb549a31beef04d966ba4f491 Gerrit-Change-Number: 75234 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Mon, 15 May 2023 20:02:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: meson: Add support for ni845x_spi on Windows
by Thomas Heijligen (Code Review) 15 May '23

15 May '23

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/75236 to look at the new patch set (#3). Change subject: meson: Add support for ni845x_spi on Windows ...................................................................... meson: Add support for ni845x_spi on Windows TEST=On MSYS32 MINGW32 with ni845x library installed: meson setup -Dprogrammer=ni845x build meson compile -C build ./build/flashrom.exe lists the ni845x_spi as choise. Change-Id: I2d32f11852ac1a5184af8e8683ca1914a6e72973 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M meson.build M meson_options.txt M ni845x_spi.c 3 files changed, 48 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/36/75236/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/75236 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2d32f11852ac1a5184af8e8683ca1914a6e72973 Gerrit-Change-Number: 75236 Gerrit-PatchSet: 3 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: Makefile: Simplify the NI-845X detection
by Angel Pons (Code Review) 15 May '23

15 May '23

Attention is currently required from: Miklós Márton, Thomas Heijligen. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/75234 ) Change subject: Makefile: Simplify the NI-845X detection ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/75234 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2115c30d0884e35eb549a31beef04d966ba4f491 Gerrit-Change-Number: 75234 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Attention: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Attention: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Mon, 15 May 2023 19:58:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: meson: Add support for ni845x_spi on windows
by Thomas Heijligen (Code Review) 15 May '23

15 May '23

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/75236 to look at the new patch set (#2). Change subject: meson: Add support for ni845x_spi on windows ...................................................................... meson: Add support for ni845x_spi on windows Change-Id: I2d32f11852ac1a5184af8e8683ca1914a6e72973 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M meson.build M meson_options.txt M ni845x_spi.c 3 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/36/75236/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/75236 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2d32f11852ac1a5184af8e8683ca1914a6e72973 Gerrit-Change-Number: 75236 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: meson: Add support for ni845x_spi on windows
by Thomas Heijligen (Code Review) 15 May '23

15 May '23

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/75236 ) Change subject: meson: Add support for ni845x_spi on windows ...................................................................... meson: Add support for ni845x_spi on windows Change-Id: I2d32f11852ac1a5184af8e8683ca1914a6e72973 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M meson.build M meson_options.txt M ni845x_spi.c 3 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/36/75236/1 diff --git a/meson.build b/meson.build index b04f7e5..cd52b1e 100644 --- a/meson.build +++ b/meson.build @@ -149,6 +149,21 @@ libftdi1 = dependency('libftdi1', required : group_ftdi) libjaylink = dependency('libjaylink', required : group_jlink) +if host_machine.system() == 'windows' + _libni845x = cc.find_library('ni845x', + dirs : get_option('ni845x_search_path'), + required : get_option('programmer').contains('ni845x_spi')) +else + _libni845x = dependency('', required : false) +endif +if _libni845x.found() + libni845x = declare_dependency( + dependencies : [ _libni845x ], + include_directories : [ get_option('ni845x_search_path') ]) +else + libni845x = _libni845x +endif + subdir('platform') if systems_hwaccess.contains(host_machine.system()) @@ -369,6 +384,14 @@ 'flags' : [ '-DCONFIG_MSTARDDC_SPI=1' ], 'default' : false }, + 'ni845x_spi' : { + 'systems' : [ 'windows' ], + 'cpu_families' : [ 'x86' ], # The required ni845x library is 32-bit only + 'deps' : [ libni845x ], + 'srcs' : files('ni845x_spi.c'), + 'flsgs' : [ '-DCONFIG_NI845X_SPI=1' ], + 'default' : false, + }, 'nic3com' : { 'systems' : systems_hwaccess, 'cpu_families' : cpus_port_io, diff --git a/meson_options.txt b/meson_options.txt index 732d8d52..e62deb6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -13,10 +13,12 @@ 'asm106x', 'atahpt', 'atapromise', 'atavia', 'buspirate_spi', 'ch341a_spi', 'ch347_spi','dediprog', 'developerbox_spi', 'digilent_spi', 'dirtyjtag_spi', 'drkaiser', 'dummy', 'ft2232_spi', 'gfxnvidia', 'internal', 'it8212', 'jlink_spi', 'linux_mtd', 'linux_spi', 'mediatek_i2c_spi', - 'mstarddc_spi', 'nic3com', 'nicintel', 'nicintel_eeprom', 'nicintel_spi', 'nicnatsemi', + 'mstarddc_spi', 'ni845x_spi', 'nic3com', 'nicintel', 'nicintel_eeprom', 'nicintel_spi', 'nicnatsemi', 'nicrealtek', 'ogp_spi', 'parade_lspcon', 'pickit2_spi', 'pony_spi', 'raiden_debug_spi', 'rayer_spi', 'realtek_mst_i2c_spi', 'satamv', 'satasii', 'serprog', 'stlinkv3_spi', 'usbblaster_spi', ], description: 'Active programmers') option('llvm_cov', type : 'feature', value : 'disabled', description : 'build for llvm code coverage') option('man-pages', type : 'feature', value : 'auto', description : 'build the man-page for classic_cli') option('documentation', type : 'feature', value : 'auto', description : 'build the html documentation') +option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\National Instruments\Ni-845x\MS Visual C', + description : 'Path to search for the proprietary ni845x library and header (32-bit Windows only)') diff --git a/ni845x_spi.c b/ni845x_spi.c index d4ae294..6e7bb76 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -15,6 +15,13 @@ * */ +/* The ni845x header does need the WIN32 symbol to be defined and meson does not do it. + * Define it just here, since this driver will only work on 32-bit Windows. + */ +#ifndef WIN32 +#define WIN32 +#endif + #include <ctype.h> #include <inttypes.h> #include <string.h> -- To view, visit https://review.coreboot.org/c/flashrom/+/75236 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2d32f11852ac1a5184af8e8683ca1914a6e72973 Gerrit-Change-Number: 75236 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: Makefile: Simplify the NI-845X detection
by Thomas Heijligen (Code Review) 15 May '23

15 May '23

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/75234 ) Change subject: Makefile: Simplify the NI-845X detection ...................................................................... Makefile: Simplify the NI-845X detection The current auto detection is kind of broken. Since the NI-845X driver package is likely not changing, hardcode `C:\Program Files (x86)\National Instuments\NI-845x\MS Visual C` as default path to search for the library and header. This can be overridden by setting `CONFIG_NI845X_LIBRARY_PATH` to the custom path. TEST=Run make HAS_LIB_NI845X=yes CONFIG_NI845X=yes successfully on MSYS2 MINGW32 Change-Id: I2115c30d0884e35eb549a31beef04d966ba4f491 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile 1 file changed, 22 insertions(+), 13 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/34/75234/1 diff --git a/Makefile b/Makefile index da5203e..c2fc605 100644 --- a/Makefile +++ b/Makefile @@ -211,19 +211,9 @@ CONFIG_LIBFTDI1_CFLAGS := $(call dependency_cflags, libftdi1) CONFIG_LIBFTDI1_LDFLAGS := $(call dependency_ldflags, libftdi1) -# Hack to keep legacy auto detection of Program Files (x86), Only active if none of the CONFIG_ variables for ni845x are set. -ifeq ($(CONFIG_NI845X_LIBRARY_PATH)$(CONFIG_LIB_NI845X_CFLAGS)$(CONFIG_LIB_NI845X_LDFLAGS),) -PROGRAMFILES_X86 = $(shell env | sed -n "s/^PROGRAMFILES(X86)=//p") -ifneq ($(PROGRAMFILES_X86DIR),) -ifneq ($(PROGRAMFILES_X86DIR), ${PROGRAMFILES}) -NI854_X86_LIBRARY_PATH := '${PROGRAMFILES_X86}\National Instruments\NI-845x\MS Visual C' -endif -endif -endif - -CONFIG_NI845X_LIBRARY_PATH := '${PROGRAMFILES}\National Instruments\NI-845x\MS Visual C' -CONFIG_LIB_NI845X_CFLAGS := -I$(CONFIG_NI845X_LIBRARY_PATH) $(if NI854_X86_LIBRARY_PATH, -I${NI854_X86_LIBRARY_PATH}) -CONFIG_LIB_NI845X_LDFLAGS := -L$(CONFIG_NI845X_LIBRARY_PATH) $(if NI854_X86_LIBRARY_PATH, -L${NI854_X86_LIBRARY_PATH}) -lni845x +CONFIG_NI845X_LIBRARY_PATH := 'C:\Program Files (x86)\National Instruments\NI-845x\MS Visual C' +CONFIG_LIB_NI845X_CFLAGS := -I$(CONFIG_NI845X_LIBRARY_PATH) +CONFIG_LIB_NI845X_LDFLAGS := -L$(CONFIG_NI845X_LIBRARY_PATH) -lni845x CONFIG_LIBJAYLINK_VERSION := $(call dependency_version, libjaylink) CONFIG_LIBJAYLINK_CFLAGS := $(call dependency_cflags, libjaylink) -- To view, visit https://review.coreboot.org/c/flashrom/+/75234 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2115c30d0884e35eb549a31beef04d966ba4f491 Gerrit-Change-Number: 75234 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: tests/io_mock.h: add missing includes
by Thomas Heijligen (Code Review) 15 May '23

15 May '23

Attention is currently required from: Anastasia Klimchuk. Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/75235 ) Change subject: tests/io_mock.h: add missing includes ...................................................................... tests/io_mock.h: add missing includes When libusb is not around for the tests struct timeval and mode_t are not defined on mingw. Add both missing header to compile the tests under MSYS2 MINGW32/64 without libusb. Change-Id: Ic76653c8f3b5d7043ab6080d4e2e1748590ad070 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M tests/io_mock.h 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/35/75235/1 diff --git a/tests/io_mock.h b/tests/io_mock.h index 9798066..04b0ef5 100644 --- a/tests/io_mock.h +++ b/tests/io_mock.h @@ -38,6 +38,10 @@ #include <stdint.h> +/* Required for struct timeval and mode_t */ +#include <sys/types.h> +#include <sys/time.h> + #include "usb_unittests.h" /* Address value needs fit into uint8_t. */ -- To view, visit https://review.coreboot.org/c/flashrom/+/75235 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic76653c8f3b5d7043ab6080d4e2e1748590ad070 Gerrit-Change-Number: 75235 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: doc: Add Windows MSYS2 build instructions
by Thomas Heijligen (Code Review) 15 May '23

15 May '23

Attention is currently required from: Thomas Heijligen. Hello build bot (Jenkins), Angel Pons, Anastasia Klimchuk, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/75189 to look at the new patch set (#4). Change subject: doc: Add Windows MSYS2 build instructions ...................................................................... doc: Add Windows MSYS2 build instructions Change-Id: I847428535547242ff32af92c4fe8477241826814 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M doc/dev_guide/building_from_source.rst 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/89/75189/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/75189 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I847428535547242ff32af92c4fe8477241826814 Gerrit-Change-Number: 75189 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: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newpatchset

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit