physmap: rename to hwaccess_physmap, create own header
Line up physmap with the other hwaccess related code.
Change-Id: Ieba6f4e94cfc3e668fcb8b3c978de5908aed2592
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Original-Reviewed-on: https://review.coreboot.org/c/flashrom/+/60113
Original-Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom-stable/+/72267
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/Makefile b/Makefile
index d9cc6ce..b73bcb9 100644
--- a/Makefile
+++ b/Makefile
@@ -783,7 +783,7 @@
ifneq ($(NEED_RAW_ACCESS), )
# Raw memory, MSR or PCI port I/O access.
FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1'
-PROGRAMMER_OBJS += physmap.o hwaccess.o
+PROGRAMMER_OBJS += hwaccess.o hwaccess_physmap.o
ifeq ($(ARCH), x86)
FEATURE_CFLAGS += -D'__FLASHROM_HAVE_OUTB__=1'
diff --git a/atapromise.c b/atapromise.c
index c8c19f9..ed53350 100644
--- a/atapromise.c
+++ b/atapromise.c
@@ -20,6 +20,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
#define MAX_ROM_DECODE (32 * 1024)
diff --git a/cbtable.c b/cbtable.c
index d3106a3..660b487 100644
--- a/cbtable.c
+++ b/cbtable.c
@@ -26,6 +26,7 @@
#include "flash.h"
#include "programmer.h"
#include "coreboot_tables.h"
+#include "hwaccess_physmap.h"
static char *cb_vendor = NULL, *cb_model = NULL;
diff --git a/chipset_enable.c b/chipset_enable.c
index 44afed7..5afb503 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -37,6 +37,7 @@
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
#include "hwaccess_x86_msr.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
#define NOT_DONE_YET 1
diff --git a/dmi.c b/dmi.c
index 3b68233..4f357f9 100644
--- a/dmi.c
+++ b/dmi.c
@@ -33,6 +33,7 @@
#include "flash.h"
#include "hwaccess.h"
+#include "hwaccess_physmap.h"
#include "programmer.h"
/* Enable SMBIOS decoding. Currently legacy DMI decoding is enough. */
diff --git a/drkaiser.c b/drkaiser.c
index b22ce55..a0133c6 100644
--- a/drkaiser.c
+++ b/drkaiser.c
@@ -19,6 +19,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
#define PCI_VENDOR_ID_DRKAISER 0x1803
diff --git a/flashrom.c b/flashrom.c
index ccc7132..03457d3 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -38,6 +38,7 @@
#include "flashchips.h"
#include "programmer.h"
#include "hwaccess.h"
+#include "hwaccess_physmap.h"
#include "chipdrivers.h"
const char flashrom_version[] = FLASHROM_VERSION;
diff --git a/gfxnvidia.c b/gfxnvidia.c
index 381f861..7edcb66 100644
--- a/gfxnvidia.c
+++ b/gfxnvidia.c
@@ -21,6 +21,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
#define PCI_VENDOR_ID_NVIDIA 0x10de
diff --git a/physmap.c b/hwaccess_physmap.c
similarity index 99%
rename from physmap.c
rename to hwaccess_physmap.c
index d9b1e4f..42c3c3e 100644
--- a/physmap.c
+++ b/hwaccess_physmap.c
@@ -23,8 +23,7 @@
#include <string.h>
#include <errno.h>
#include "flash.h"
-#include "programmer.h"
-#include "hwaccess.h"
+#include "hwaccess_physmap.h"
#if !defined(__DJGPP__) && !defined(__LIBPAYLOAD__)
/* No file access needed/possible to get mmap access permissions or access MSR. */
diff --git a/hwaccess_physmap.h b/hwaccess_physmap.h
new file mode 100644
index 0000000..eb3ddb8
--- /dev/null
+++ b/hwaccess_physmap.h
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the flashrom project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __HWACCESS_PHYSMAP_H__
+#define __HWACCESS_PHYSMAP_H__
+
+#include <stddef.h>
+#include <stdint.h>
+
+void *physmap(const char *descr, uintptr_t phys_addr, size_t len);
+void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len);
+void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len);
+void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len);
+void physunmap(void *virt_addr, size_t len);
+void physunmap_unaligned(void *virt_addr, size_t len);
+
+#endif /* __HWACCESS_PHYSMAP_H__ */
\ No newline at end of file
diff --git a/ichspi.c b/ichspi.c
index 6777425..9d04d8b 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -25,6 +25,7 @@
#include "flash.h"
#include "programmer.h"
#include "hwaccess.h"
+#include "hwaccess_physmap.h"
#include "spi.h"
#include "ich_descriptors.h"
diff --git a/internal.c b/internal.c
index 8445455..44dcb25 100644
--- a/internal.c
+++ b/internal.c
@@ -21,6 +21,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t devclass)
diff --git a/it8212.c b/it8212.c
index 346ef19..4007f63 100644
--- a/it8212.c
+++ b/it8212.c
@@ -19,6 +19,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
static uint8_t *it8212_bar = NULL;
diff --git a/mcp6x_spi.c b/mcp6x_spi.c
index 7444631..5d9135f 100644
--- a/mcp6x_spi.c
+++ b/mcp6x_spi.c
@@ -24,6 +24,7 @@
#include "flash.h"
#include "programmer.h"
#include "hwaccess.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
/* Bit positions for each pin. */
diff --git a/meson.build b/meson.build
index 4db878b..a4b5532 100644
--- a/meson.build
+++ b/meson.build
@@ -333,7 +333,7 @@
srcs += 'hwaccess.c'
srcs += 'hwaccess_x86_io.c'
srcs += 'hwaccess_x86_msr.c'
- srcs += 'physmap.c'
+ srcs += 'hwaccess_physmap.c'
cargs += '-DNEED_RAW_ACCESS=1'
cargs += '-D__FLASHROM_HAVE_OUTB__=1'
endif
diff --git a/nicintel.c b/nicintel.c
index 1051755..0ad9f25 100644
--- a/nicintel.c
+++ b/nicintel.c
@@ -20,6 +20,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
static uint8_t *nicintel_bar;
diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c
index e5e95d8..9f69ece 100644
--- a/nicintel_eeprom.c
+++ b/nicintel_eeprom.c
@@ -36,6 +36,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
#define PCI_VENDOR_ID_INTEL 0x8086
diff --git a/nicintel_spi.c b/nicintel_spi.c
index c73aa13..616c161 100644
--- a/nicintel_spi.c
+++ b/nicintel_spi.c
@@ -36,6 +36,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
#define PCI_VENDOR_ID_INTEL 0x8086
diff --git a/ogp_spi.c b/ogp_spi.c
index 250cf75..dcd7e90 100644
--- a/ogp_spi.c
+++ b/ogp_spi.c
@@ -20,6 +20,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
#define PCI_VENDOR_ID_OGP 0x1227
diff --git a/programmer.h b/programmer.h
index 36fdabd..8d324d5 100644
--- a/programmer.h
+++ b/programmer.h
@@ -229,14 +229,6 @@
int processor_flash_enable(void);
#endif
-/* physmap.c */
-void *physmap(const char *descr, uintptr_t phys_addr, size_t len);
-void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len);
-void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len);
-void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len);
-void physunmap(void *virt_addr, size_t len);
-void physunmap_unaligned(void *virt_addr, size_t len);
-
#if CONFIG_INTERNAL == 1
/* cbtable.c */
int cb_parse_table(const char **vendor, const char **model);
diff --git a/satamv.c b/satamv.c
index 2f8e224..f1c3828 100644
--- a/satamv.c
+++ b/satamv.c
@@ -21,6 +21,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
static uint8_t *mv_bar;
diff --git a/satasii.c b/satasii.c
index 9dcb38c..886559d 100644
--- a/satasii.c
+++ b/satasii.c
@@ -19,6 +19,7 @@
#include "programmer.h"
#include "hwaccess.h"
#include "hwaccess_x86_io.h"
+#include "hwaccess_physmap.h"
#include "platform/pci.h"
#define PCI_VENDOR_ID_SII 0x1095
diff --git a/sb600spi.c b/sb600spi.c
index d0bf68f..fd98aff 100644
--- a/sb600spi.c
+++ b/sb600spi.c
@@ -24,6 +24,7 @@
#include "flash.h"
#include "programmer.h"
#include "hwaccess.h"
+#include "hwaccess_physmap.h"
#include "spi.h"
#include "platform/pci.h"