On Fri, 26 Feb 2016 14:41:33 +0100 Carl-Daniel Hailfinger <c-d.hailfinger.devel.2...@gmx.net> wrote:
> Don't build atapromise on libpayload. > libpayload struct pci_dev is missing a member named 'rom_size' needed by > atapromise. > Allow linux_spi and mstarddc_spi on Android. > Allow pony_spi on architectures with unsupported raw access. > > Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2...@gmx.net> > > Index: flashrom-makefile_driver_blacklist_fix_dependencies/Makefile > =================================================================== > --- flashrom-makefile_driver_blacklist_fix_dependencies/Makefile > (Revision 1943) > +++ flashrom-makefile_driver_blacklist_fix_dependencies/Makefile > (Arbeitskopie) > @@ -320,6 +320,11 @@ > else > override CONFIG_DEDIPROG = no > endif > +ifeq ($(CONFIG_ATAPROMISE), yes) > +UNSUPPORTED_FEATURES += CONFIG_ATAPROMISE=yes > +else > +override CONFIG_ATAPROMISE = no > +endif > ifeq ($(CONFIG_FT2232_SPI), yes) > UNSUPPORTED_FEATURES += CONFIG_FT2232_SPI=yes > else This was already fixed in r1938. > @@ -343,6 +348,7 @@ > endif > > ifneq ($(TARGET_OS), Linux) > +ifeq ($(TARGET_OS), Android) > ifeq ($(CONFIG_LINUX_SPI), yes) > UNSUPPORTED_FEATURES += CONFIG_LINUX_SPI=yes > else > @@ -354,6 +360,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 Shouldn't this be +ifneq? AFAICS this prohibits building mstar and linux_spi on android but allows it on all non-linux platforms :) > @@ -428,11 +435,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 Right. What about MSTAR? -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner _______________________________________________ flashrom mailing list flashrom@flashrom.org http://www.flashrom.org/mailman/listinfo/flashrom
