1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
|
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('flashromutils', 'c',
version : run_command('util/getversion.sh', '-v').stdout().strip(),
license : 'GPL-2.0',
meson_version : '>=0.50.0',
- default_options : ['warning_level=2', 'c_std=c99'],
+ default_options : ['warning_level=2', 'c_std=gnu99'],
)
# libtool versioning
@@ -105,6 +105,10 @@ cargs = []
deps = []
srcs = []
+config_bitbang_spi = false
+need_libftdi = false
+need_libpci = false
+need_libusb = false
need_raw_access = false
need_serial = false
@@ -119,27 +123,25 @@ if cc.check_header('sys/utsname.h')
add_project_arguments('-DHAVE_UTSNAME=1', language : 'c')
endif
-# some programmers require libusb
-if get_option('usb')
- srcs += 'usbdev.c'
- srcs += 'usb_device.c'
- deps += dependency('libusb-1.0')
-else
+if get_option('no_libftdi_programmers')
+ message('Disabling ALL libftdi-based programmers')
+ config_ft2232_spi = false
+ config_usbblaster_spi = false
+endif
+
+if get_option('no_libusb_programmers')
+ message('Disabling ALL libusb-based programmers')
config_ch341a_spi = false
config_dediprog = false
config_digilent_spi = false
config_developerbox_spi = false
config_pickit2_spi = false
config_raiden_debug_spi = false
+ config_stlinkv3_spi = false
endif
-# some programmers require libpci
-if get_option('pciutils')
- srcs += 'pcidev.c'
- deps += dependency('libpci')
- need_raw_access = true
- cargs += '-DNEED_PCI=1'
-else
+if get_option('no_libpci_programmers')
+ message('Disabling ALL libpci-based programmers')
config_atahpt = false
config_atapromise = false
config_atavia = false
@@ -161,14 +163,17 @@ endif
# set defines for configured programmers
if config_atahpt
srcs += 'atahpt.c'
+ need_libpci = true
cargs += '-DCONFIG_ATAHPT=1'
endif
if config_atapromise
srcs += 'atapromise.c'
+ need_libpci = true
cargs += '-DCONFIG_ATAPROMISE=1'
endif
if config_atavia
srcs += 'atavia.c'
+ need_libpci = true
cargs += '-DCONFIG_ATAVIA=1'
endif
if config_buspirate_spi
@@ -178,18 +183,22 @@ if config_buspirate_spi
endif
if config_ch341a_spi
srcs += 'ch341a_spi.c'
+ need_libusb = true
cargs += '-DCONFIG_CH341A_SPI=1'
endif
if config_dediprog
srcs += 'dediprog.c'
+ need_libusb = true
cargs += '-DCONFIG_DEDIPROG=1'
endif
if config_developerbox_spi
srcs += 'developerbox_spi.c'
+ need_libusb = true
cargs += '-DCONFIG_DEVELOPERBOX_SPI=1'
endif
if config_digilent_spi
srcs += 'digilent_spi.c'
+ need_libusb = true
cargs += '-DCONFIG_DIGILENT_SPI=1'
endif
if config_jlink_spi
@@ -199,6 +208,7 @@ if config_jlink_spi
endif
if config_drkaiser
srcs += 'drkaiser.c'
+ need_libpci = true
cargs += '-DCONFIG_DRKAISER=1'
endif
if config_dummy
@@ -207,16 +217,18 @@ if config_dummy
endif
if config_ft2232_spi
srcs += 'ft2232_spi.c'
+ need_libftdi = true
cargs += '-DCONFIG_FT2232_SPI=1'
- deps += dependency('libftdi1')
cargs += '-DHAVE_FT232H=1'
endif
if config_gfxnvidia
srcs += 'gfxnvidia.c'
+ need_libpci = true
cargs += '-DCONFIG_GFXNVIDIA=1'
endif
if config_raiden_debug_spi
srcs += 'raiden_debug_spi.c'
+ need_libusb = true
cargs += '-DCONFIG_RAIDEN_DEBUG_SPI=1'
endif
if config_internal
@@ -235,6 +247,7 @@ if config_internal
srcs += 'sb600spi.c'
srcs += 'wbsio_spi.c'
endif
+ need_libpci = true
config_bitbang_spi = true
cargs += '-DCONFIG_INTERNAL=1'
if get_option('config_internal_dmi')
@@ -244,6 +257,7 @@ if config_internal
endif
if config_it8212
srcs += 'it8212.c'
+ need_libpci = true
cargs += '-DCONFIG_IT8212=1'
endif
if config_linux_mtd
@@ -260,36 +274,44 @@ if config_mstarddc_spi
endif
if config_nic3com
srcs += 'nic3com.c'
+ need_libpci = true
cargs += '-DCONFIG_NIC3COM=1'
endif
if config_nicintel
srcs += 'nicintel.c'
+ need_libpci = true
cargs += '-DCONFIG_NICINTEL=1'
endif
if config_nicintel_eeprom
srcs += 'nicintel_eeprom.c'
+ need_libpci = true
cargs += '-DCONFIG_NICINTEL_EEPROM=1'
endif
if config_nicintel_spi
srcs += 'nicintel_spi.c'
+ need_libpci = true
config_bitbang_spi = true
cargs += '-DCONFIG_NICINTEL_SPI=1'
endif
if config_nicnatsemi
srcs += 'nicnatsemi.c'
+ need_libpci = true
cargs += '-DCONFIG_NICNATSEMI=1'
endif
if config_nicrealtek
srcs += 'nicrealtek.c'
+ need_libpci = true
cargs += '-DCONFIG_NICREALTEK=1'
endif
if config_ogp_spi
config_bitbang_spi = true
srcs += 'ogp_spi.c'
+ need_libpci = true
cargs += '-DCONFIG_OGP_SPI=1'
endif
if config_pickit2_spi
srcs += 'pickit2_spi.c'
+ need_libusb = true
cargs += '-DCONFIG_PICKIT2_SPI=1'
endif
if config_pony_spi
@@ -306,10 +328,12 @@ if config_rayer_spi
endif
if config_satamv
srcs += 'satamv.c'
+ need_libpci = true
cargs += '-DCONFIG_SATAMV=1'
endif
if config_satasii
srcs += 'satasii.c'
+ need_libpci = true
cargs += '-DCONFIG_SATASII=1'
endif
if config_serprog
@@ -319,10 +343,12 @@ if config_serprog
endif
if config_usbblaster_spi
srcs += 'usbblaster_spi.c'
+ need_libftdi = true
cargs += '-DCONFIG_USBBLASTER_SPI=1'
endif
if config_stlinkv3_spi
srcs += 'stlinkv3_spi.c'
+ need_libusb = true
cargs += '-DCONFIG_STLINKV3_SPI=1'
endif
if config_lspcon_i2c_spi
@@ -344,6 +370,26 @@ if host_machine.system() == 'linux'
srcs += 'i2c_helper_linux.c'
endif
+# some programmers require libftdi
+if need_libftdi
+ deps += dependency('libftdi1')
+endif
+
+# some programmers require libpci
+if need_libpci
+ srcs += 'pcidev.c'
+ deps += dependency('libpci')
+ need_raw_access = true
+ cargs += '-DNEED_PCI=1'
+endif
+
+# some programmers require libusb
+if need_libusb
+ srcs += 'usbdev.c'
+ srcs += 'usb_device.c'
+ deps += dependency('libusb-1.0')
+endif
+
# raw memory, MSR or PCI port I/O access
if need_raw_access
srcs += 'hwaccess.c'
@@ -493,10 +539,12 @@ executable(
subdir('util')
# unit-test framework
+if get_option('build_tests')
+
cmocka_dep = dependency(
'cmocka',
fallback: ['cmocka', 'cmocka_dep'],
- required: false
+ required: true
)
flashrom_test_dep = declare_dependency(
include_directories : include_directories('.'),
@@ -519,3 +567,5 @@ flashrom_test_dep = declare_dependency(
if cmocka_dep.found()
subdir('tests')
endif
+
+endif
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,9 +1,12 @@
-option('pciutils', type : 'boolean', value : true, description : 'use pciutils')
-option('usb', type : 'boolean', value : true, description : 'use libusb1')
+option('no_libftdi_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libftdi')
+option('no_libpci_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libpci')
+option('no_libusb_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libusb')
option('print_wiki', type : 'boolean', value : true, description : 'Print Wiki')
option('default_programmer_name', type : 'string', description : 'default programmer')
option('default_programmer_args', type : 'string', description : 'default programmer arguments')
+option('build_tests', type : 'boolean', value : false, description : 'build the test suite')
+
option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers')
option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller')
option('config_atavia', type : 'boolean', value : true, description : 'VIA VT6421A LPC memory')
|