From 601f4cd02d1368e6167c9d08dc264ab0a2148cc3 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sun, 28 Feb 2016 22:04:51 +0000 Subject: Makefile: Fix driver blacklist dependencies Allow mstarddc_spi and pony_spi on Android. Allow mstarddc_spi and pony_spi on architectures with unsupported raw access. Corresponding to flashrom svn r1946. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Tauner --- Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 1511eef..927105d 100644 --- a/Makefile +++ b/Makefile @@ -343,6 +343,8 @@ endif endif ifneq ($(TARGET_OS), Linux) +# Android is handled internally as separate OS, but it supports CONFIG_LINUX_SPI and CONFIG_MSTARDDC_SPI +ifneq ($(TARGET_OS), Android) ifeq ($(CONFIG_LINUX_SPI), yes) UNSUPPORTED_FEATURES += CONFIG_LINUX_SPI=yes else @@ -354,6 +356,7 @@ else override CONFIG_MSTARDDC_SPI = no endif endif +endif ifeq ($(TARGET_OS), Android) # Android on x86 (currently) does not provide raw PCI port I/O operations @@ -428,11 +431,6 @@ UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes else override CONFIG_RAYER_SPI = no endif -ifeq ($(CONFIG_PONY_SPI), yes) -UNSUPPORTED_FEATURES += CONFIG_PONY_SPI=yes -else -override CONFIG_PONY_SPI = no -endif ifeq ($(CONFIG_NIC3COM), yes) UNSUPPORTED_FEATURES += CONFIG_NIC3COM=yes else @@ -463,11 +461,6 @@ UNSUPPORTED_FEATURES += CONFIG_ATAPROMISE=yes else override CONFIG_ATAPROMISE = no endif -ifeq ($(CONFIG_MSTARDDC_SPI), yes) -UNSUPPORTED_FEATURES += CONFIG_MSTARDDC_SPI=yes -else -override CONFIG_MSTARDDC_SPI = no -endif ifeq ($(CONFIG_DRKAISER), yes) UNSUPPORTED_FEATURES += CONFIG_DRKAISER=yes else -- cgit v1.1