Thomas Heijligen submitted this change.

View Change



4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Thomas Heijligen: Looks good to me, approved
meson: Determine custom_baud source file only once

Change-Id: I13221bdca7d14a483f416e81e3830a495659a85e
Signed-off-by: Peter Stuge <peter@stuge.se>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/70568
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Thomas Heijligen <src@posteo.de>
---
M meson.build
1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index d78aff9..92c5590 100644
--- a/meson.build
+++ b/meson.build
@@ -101,6 +101,12 @@
add_project_arguments('-DIS_WINDOWS=0', language : 'c')
endif

+if host_machine.system() == 'linux'
+ custom_baud_c = 'custom_baud_linux.c'
+else
+ custom_baud_c = 'custom_baud.c'
+endif
+
systems_hwaccess = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd' ]
systems_serial = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'darwin' ]

@@ -175,7 +181,7 @@
'buspirate_spi' : {
'systems' : systems_serial,
'groups' : [ group_serial, group_external ],
- 'srcs' : files('buspirate_spi.c', 'serial.c', (host_machine.system() == 'linux' ? 'custom_baud_linux.c' : 'custom_baud.c')),
+ 'srcs' : files('buspirate_spi.c', 'serial.c', custom_baud_c),
'flags' : [ '-DCONFIG_BUSPIRATE_SPI=1' ],
},
'ch341a_spi' : {
@@ -391,7 +397,7 @@
'pony_spi' : {
'systems' : systems_serial,
'groups' : [ group_serial, group_external ],
- 'srcs' : files('pony_spi.c', 'serial.c', (host_machine.system() == 'linux' ? 'custom_baud_linux.c' : 'custom_baud.c')),
+ 'srcs' : files('pony_spi.c', 'serial.c', custom_baud_c),
'flags' : [ '-DCONFIG_PONY_SPI=1' ],
},
'raiden_debug_spi' : {
@@ -435,7 +441,7 @@
'serprog' : {
'systems' : systems_serial,
'groups' : [ group_serial, group_external ],
- 'srcs' : files('serprog.c', 'serial.c', (host_machine.system() == 'linux' ? 'custom_baud_linux.c' : 'custom_baud.c')),
+ 'srcs' : files('serprog.c', 'serial.c', custom_baud_c),
'flags' : [ '-DCONFIG_SERPROG=1' ],
},
'stlinkv3_spi' : {

To view, visit change 70568. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I13221bdca7d14a483f416e81e3830a495659a85e
Gerrit-Change-Number: 70568
Gerrit-PatchSet: 6
Gerrit-Owner: Peter Stuge <peter@stuge.se>
Gerrit-Reviewer: Paul Menzel <paulepanter@mailbox.org>
Gerrit-Reviewer: Thomas Heijligen <src@posteo.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged