diff options
| author | Peter Marheine <pmarheine@chromium.org> | 2022-01-19 17:11:09 +1100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2022-01-25 17:31:42 +0000 |
| commit | 36f87376a328ba3fe7c676c4e27214f23a5e146d (patch) | |
| tree | b1ef079b720915c40b1385d0017f0f0d0985dd8f /chipset_enable.c | |
| parent | 35547ed3afeac1d9840f11ef2bcc75624a355a11 (diff) | |
| download | flashrom-36f87376a328ba3fe7c676c4e27214f23a5e146d.tar.gz flashrom-36f87376a328ba3fe7c676c4e27214f23a5e146d.tar.bz2 flashrom-36f87376a328ba3fe7c676c4e27214f23a5e146d.zip | |
hwaccess: fix build on non-x86 targets
The changes to hwaccess in commit 49d758698a0dd166679c48b1a2785e50e9b0cc83
cause build failure on non-x86 systems because the hwaccess_x86_*
headers are included in some files that are built for all platforms
(particularly those in the internal programmer) and those headers in
turn include <sys/io.h> which only exists on x86.
This change avoids including those headers on non-x86 platforms so
the internal programmer can be built without errors.
The comment on the stub implementation of rget_io_perms() is also
modified to remove references to non-x86 platforms, since that file is
only built on x86 now.
BUG=None
TEST=meson build succeeds for both x86 and ARM targets
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Change-Id: I20f122679c30340b2c73afd7419e79644ddc3c4e
Reviewed-on: https://review.coreboot.org/c/flashrom/+/61194
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'chipset_enable.c')
| -rw-r--r-- | chipset_enable.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chipset_enable.c b/chipset_enable.c index d72300e6e..fe7ec1530 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -33,8 +33,6 @@ #include <errno.h> #include "flash.h" #include "programmer.h" -#include "hwaccess_x86_io.h" -#include "hwaccess_x86_msr.h" #include "hwaccess_physmap.h" #include "platform/pci.h" @@ -42,6 +40,9 @@ #if defined(__i386__) || defined(__x86_64__) +#include "hwaccess_x86_io.h" +#include "hwaccess_x86_msr.h" + static int enable_flash_ali_m1533(struct pci_dev *dev, const char *name) { uint8_t tmp; |