Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54849 )
Change subject: meson/: Add missing config for NI845_SPI drv ......................................................................
meson/: Add missing config for NI845_SPI drv
Configuration is only present in the Makefile however is missing in the corresponding meson configs.
BUG=none BRANCH=none TEST=meson continues to build.
Change-Id: I85387e94f1b159733d0124f1a6dfde1e3d16827f Signed-off-by: Edward O'Callaghan quasisec@google.com --- M meson.build M meson_options.txt 2 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/49/54849/1
diff --git a/meson.build b/meson.build index 81d63a9..1d92ae9 100644 --- a/meson.build +++ b/meson.build @@ -51,6 +51,7 @@ config_linux_spi = get_option('config_linux_spi') config_mec1308 = get_option('config_mec1308') config_mstarddc_spi = get_option('config_mstarddc_spi') +config_ni845x_spi = get_option('config_ni845x_spi') config_nic3com = get_option('config_nic3com') config_nicintel_eeprom = get_option('config_nicintel_eeprom') config_nicintel = get_option('config_nicintel') @@ -100,6 +101,7 @@ config_developerbox_spi = false config_pickit2_spi = false config_raiden_debug_spi = false + config_ni845x_spi = false endif
# some programmers require libpci @@ -235,6 +237,11 @@ srcs += 'mstarddc_spi.c' cargs += '-DCONFIG_MSTARDDC_SPI=1' endif +if config_ni845x_spi + srcs += 'ni845x_spi.c' + cargs += '-DCONFIG_NI845X_SPI=1' + deps += dependency('libni845x') +endif if config_nic3com srcs += 'nic3com.c' cargs += '-DCONFIG_NIC3COM=1' diff --git a/meson_options.txt b/meson_options.txt index cd92f10..eee51ea 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,6 +24,7 @@ option('config_linux_spi', type : 'boolean', value : true, description : 'Linux spidev interfaces') option('config_mec1308', type : 'boolean', value : true, description : 'Microchip MEC1308 Embedded Controller') option('config_mstarddc_spi', type : 'boolean', value : false, description : 'MSTAR DDC support') +option('config_ni845x_spi', type : 'boolean', value : false, description : 'National Instruments USB-845x') option('config_nic3com', type : 'boolean', value : true, description : '3Com NICs') option('config_nicintel_eeprom', type : 'boolean', value : true, description : 'EEPROM on Intel NICs') option('config_nicintel_spi', type : 'boolean', value : true, description : 'SPI on Intel NICs')