From 375f34d362ff26feb00ad544c545d46511607914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Mon, 28 Mar 2016 09:17:44 +0200
Subject: [PATCH] flashrom: fix full and pci variants
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 utils/flashrom/Makefile    | 2 +-
 utils/flashrom/flashrom.mk | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/utils/flashrom/Makefile b/utils/flashrom/Makefile
index 31df97b72..bc062d3f5 100644
--- a/utils/flashrom/Makefile
+++ b/utils/flashrom/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=flashrom
 PKG_VERSION:=0.9.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.flashrom.org/releases
diff --git a/utils/flashrom/flashrom.mk b/utils/flashrom/flashrom.mk
index 1a4817bb0..f910758a4 100644
--- a/utils/flashrom/flashrom.mk
+++ b/utils/flashrom/flashrom.mk
@@ -19,6 +19,7 @@ ifeq ($(BUILD_VARIANT),full)
   FLASHROM_BASIC := yes
   FLASHROM_FTDI := yes
   FLASHROM_PCI := yes
+  FLASHROM_RAW := yes
   FLASHROM_SERIAL := yes
   FLASHROM_USB := yes
 endif
@@ -27,6 +28,7 @@ ifeq ($(BUILD_VARIANT),pci)
   FLASHROM_BASIC := yes
   FLASHROM_FTDI := no
   FLASHROM_PCI := yes
+  FLASHROM_RAW := yes
   FLASHROM_SERIAL := no
   FLASHROM_USB := no
 endif
@@ -35,6 +37,7 @@ ifeq ($(BUILD_VARIANT),spi)
   FLASHROM_BASIC := yes
   FLASHROM_FTDI := no
   FLASHROM_PCI := no
+  FLASHROM_RAW := no
   FLASHROM_SERIAL := no
   FLASHROM_USB := no
 endif
@@ -43,6 +46,7 @@ ifeq ($(BUILD_VARIANT),usb)
   FLASHROM_BASIC := yes
   FLASHROM_FTDI := yes
   FLASHROM_PCI := no
+  FLASHROM_RAW := no
   FLASHROM_SERIAL := yes
   FLASHROM_USB := yes
 endif
@@ -57,10 +61,13 @@ $(eval $(call DefineConfig,FTDI,$(FLASHROM_FTDI)))
 $(eval $(call DefineProgrammer,FT2232_SPI,$(FLASHROM_FTDI)))
 $(eval $(call DefineProgrammer,USBBLASTER_SPI,$(FLASHROM_FTDI)))
 
+# RAW
+$(eval $(call DefineConfig,RAW_ACCESS,$(FLASHROM_RAW)))
+$(eval $(call DefineProgrammer,RAYER_SPI,$(FLASHROM_RAW)))
+
 # PCI
 $(eval $(call DefineConfig,PCI,$(FLASHROM_PCI)))
 $(eval $(call DefineProgrammer,INTERNAL,$(FLASHROM_PCI)))
-$(eval $(call DefineProgrammer,RAYER_SPI,$(FLASHROM_PCI)))
 $(eval $(call DefineProgrammer,NIC3COM,$(FLASHROM_PCI)))
 $(eval $(call DefineProgrammer,GFXNVIDIA,$(FLASHROM_PCI)))
 $(eval $(call DefineProgrammer,SATASII,$(FLASHROM_PCI)))