[flashrom] [commit] r1938 - trunk

[repository service]

Author: stefanct
Date: Sun Feb 21 12:18:24 2016
New Revision: 1938
URL: http://flashrom.org/trac/flashrom/changeset/1938

Log:
Automatically disable atapromise for libpayload as well.

The atapromise module uses the rom_size field of the struct pci_dev found
in pci.h that does not exist in libpayload's implementation and thus does
not compile with libpayload.

Signed-off-by: Stefan Tauner <stefan.tauner at alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner at alumni.tuwien.ac.at>

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Feb 21 01:21:11 2016	(r1937)
+++ trunk/Makefile	Sun Feb 21 12:18:24 2016	(r1938)
@@ -292,6 +292,12 @@
 else
 override CONFIG_DUMMY = no
 endif
+# libpayload does not provide the romsize field in struct pci_dev that the atapromise code requires.
+ifeq ($(CONFIG_ATAPROMISE), yes)
+UNSUPPORTED_FEATURES += CONFIG_ATAPROMISE=yes
+else
+override CONFIG_ATAPROMISE = no
+endif
 # Bus Pirate, Serprog and PonyProg are not supported with libpayload (missing serial support).
 ifeq ($(CONFIG_BUSPIRATE_SPI), yes)
 UNSUPPORTED_FEATURES += CONFIG_BUSPIRATE_SPI=yes