From 694e2bf21853e9950c3fa726d21726ae13a914be Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Tue, 19 Oct 2021 16:14:55 +0200 Subject: [PATCH] Makefile: unify the use of filter Make a filter statement easier to read and fix some cosmetics. Change-Id: I6cd1e169b435cadb06423836cd9d64cdd2f51a94 Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/58451 Reviewed-by: Angel Pons Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 18651bc01..e8bf8fc70 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,7 @@ $(call mark_unsupported,$(DEPENDS_ON_LIBUSB1) $(DEPENDS_ON_LIBFTDI) $(DEPENDS_ON endif # Android is handled internally as separate OS, but it supports about the same drivers as Linux. -ifeq ($(filter $(TARGET_OS),Linux Android), ) +ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Linux Android)) $(call mark_unsupported,CONFIG_LINUX_MTD CONFIG_LINUX_SPI) $(call mark_unsupported,CONFIG_MSTARDDC_SPI CONFIG_LSPCON_I2C_SPI CONFIG_REALTEK_MST_I2C_SPI) endif @@ -250,7 +250,7 @@ CONFIG_LINUX_I2C_HELPER = yes endif # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) -ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN)) +ifneq ($(ARCH)-little, $(filter $(ARCH), x86 mips)-$(ENDIAN)) $(call mark_unsupported,CONFIG_INTERNAL) endif @@ -272,7 +272,7 @@ endif # Additionally disable all drivers needing raw access (memory, PCI, port I/O) # on architectures with unknown raw access properties. # Right now those architectures are alpha hppa m68k sh s390 -ifneq ($(ARCH),$(filter $(ARCH),x86 mips ppc arm sparc arc)) +ifneq ($(ARCH), $(filter $(ARCH), x86 mips ppc arm sparc arc)) $(call mark_unsupported,CONFIG_GFXNVIDIA CONFIG_SATASII CONFIG_ATAVIA) $(call mark_unsupported,CONFIG_DRKAISER CONFIG_NICINTEL CONFIG_NICINTEL_SPI) $(call mark_unsupported,CONFIG_NICINTEL_EEPROM CONFIG_OGP_SPI CONFIG_IT8212) @@ -805,7 +805,7 @@ CHECK_LIBUSB1 = yes FEATURE_CFLAGS += -D'NEED_LIBUSB1=1' PROGRAMMER_OBJS += usbdev.o usb_device.o # FreeBSD and DragonflyBSD use a reimplementation of libusb-1.0 that is simply called libusb -ifeq ($(TARGET_OS),$(filter $(TARGET_OS),FreeBSD DragonFlyBSD)) +ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD DragonFlyBSD)) USB1LIBS += -lusb else ifeq ($(TARGET_OS),NetBSD)