Edward O'Callaghan submitted this change.

View Change

meson: fix dependency on raw access

This is matching the following comment on Makefile:

\# This is a dirty hack, but it saves us from checking all PCI drivers and all platforms manually.
\# libpci may need raw memory, MSR or PCI port I/O on some platforms.
\# Individual drivers might have the same needs as well.

This changes fixes:

ld.lld: error: undefined symbol: rget_io_perms
>>> referenced by internal.c:243 (../flashrom-9999/internal.c:243)
>>>               libflashrom.so.1.0.0.p/internal.c.o:(internal_init)

ld.lld: error: undefined symbol: mmio_writeb
>>> referenced by internal.c:122 (../flashrom-9999/internal.c:122)
>>>               libflashrom.so.1.0.0.p/internal.c.o:(internal_chip_writeb)

ld.lld: error: undefined symbol: mmio_writew
>>> referenced by internal.c:128 (../flashrom-9999/internal.c:128)
>>>               libflashrom.so.1.0.0.p/internal.c.o:(internal_chip_writew)

ld.lld: error: undefined symbol: mmio_writel
>>> referenced by internal.c:134 (../flashrom-9999/internal.c:134)
>>>               libflashrom.so.1.0.0.p/internal.c.o:(internal_chip_writel)

ld.lld: error: undefined symbol: mmio_readb
>>> referenced by internal.c:140 (../flashrom-9999/internal.c:140)
>>>               libflashrom.so.1.0.0.p/internal.c.o:(internal_chip_readb)

ld.lld: error: undefined symbol: mmio_readw
>>> referenced by internal.c:146 (../flashrom-9999/internal.c:146)
>>>               libflashrom.so.1.0.0.p/internal.c.o:(internal_chip_readw)

ld.lld: error: undefined symbol: mmio_readl
>>> referenced by internal.c:152 (../flashrom-9999/internal.c:152)
>>>               libflashrom.so.1.0.0.p/internal.c.o:(internal_chip_readl)

ld.lld: error: undefined symbol: mmio_readn
>>> referenced by internal.c:158 (../flashrom-9999/internal.c:158)
>>>               libflashrom.so.1.0.0.p/internal.c.o:(internal_chip_readn)

ld.lld: error: undefined symbol: physmap
>>> referenced by flashrom.c:1454 (../flashrom-9999/flashrom.c:1454)
>>>               libflashrom.so.1.0.0.p/flashrom.c.o:(probe_flash)
>>> referenced by flashrom.c:1454 (../flashrom-9999/flashrom.c:1454)
>>>               libflashrom.so.1.0.0.p/flashrom.c.o:(probe_flash)
>>> referenced by flashrom.c
>>>               libflashrom.so.1.0.0.p/flashrom.c.o:(programmer_table)
>>> referenced 2 more times

ld.lld: error: undefined symbol: physunmap
>>> referenced by flashrom.c
>>>               libflashrom.so.1.0.0.p/flashrom.c.o:(programmer_table)
>>> referenced by flashrom.c
>>>               libflashrom.so.1.0.0.p/flashrom.c.o:(programmer_table)
>>> referenced by flashrom.c
>>>               libflashrom.so.1.0.0.p/flashrom.c.o:(programmer_table)

Change-Id: Id3fa4ec7a735b81e989ba9fe2b53b18d0956627a
Signed-off-by: Daniel Campello <campello@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/51577
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Richard Hughes <hughsient@gmail.com>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
---
M meson.build
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 73df722..43b0fe4 100644
--- a/meson.build
+++ b/meson.build
@@ -104,6 +104,7 @@
 if get_option('pciutils')
   srcs += 'pcidev.c'
   deps += dependency('libpci')
+  need_raw_access = true
   cargs += '-DNEED_PCI=1'
 else
   config_atahpt = false
@@ -277,7 +278,6 @@
 if config_rayer_spi
   srcs += 'rayer_spi.c'
   config_bitbang_spi = true
-  need_raw_access = true
   cargs += '-DCONFIG_RAYER_SPI=1'
 endif
 if config_satamv

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