[commit] r1946 - trunk

[repository service]

Author: hailfinger
Date: Sun Feb 28 23:04:51 2016
New Revision: 1946
URL: http://flashrom.org/trac/flashrom/changeset/1946

Log:
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.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Stefan Tauner

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Feb 28 18:04:38 2016	(r1945)
+++ trunk/Makefile	Sun Feb 28 23:04:51 2016	(r1946)
@@ -343,6 +343,8 @@
 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 @@
 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 @@
 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 @@
 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