From 49d758698a0dd166679c48b1a2785e50e9b0cc83 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Tue, 14 Dec 2021 16:36:05 +0100 Subject: hwaccess: move x86 port I/O related code into own files Allow port I/O related code to be compiled independent from memory mapping functionality. This enables for a better selection of needed hardware access types. Change-Id: I372b4a409f036da766c42bc406b596bc41b0f75a Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/60110 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9bc9bf8fc..8de6234b1 100644 --- a/Makefile +++ b/Makefile @@ -804,23 +804,22 @@ ifneq ($(NEED_RAW_ACCESS), ) FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' PROGRAMMER_OBJS += physmap.o hwaccess.o -ifeq ($(TARGET_OS), NetBSD) ifeq ($(ARCH), x86) +FEATURE_CFLAGS += -D'__FLASHROM_HAVE_OUTB__=1' +PROGRAMMER_OBJS += hwaccess_x86_io.o + +ifeq ($(TARGET_OS), NetBSD) PCILIBS += -l$(shell uname -p) endif -else ifeq ($(TARGET_OS), OpenBSD) -ifeq ($(ARCH), x86) PCILIBS += -l$(shell uname -m) endif -else +endif + ifeq ($(TARGET_OS), Darwin) # DirectHW framework can be found in the DirectHW library. PCILIBS += -framework IOKit -framework DirectHW endif -endif -endif - endif USE_LIBUSB1 := $(if $(call filter_deps,$(DEPENDS_ON_LIBUSB1)),yes,no) -- cgit v1.2.3