From cafa46bd3354b8f297aea630334f1daf31c0f830 Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Thu, 1 Dec 2022 10:49:46 -0500
Subject: [PATCH] WiP: Transcient build test of flashrom against
 https://github.com/Dasharo/flashrom/commit/5111246d8dab57249148e08509b58e9f82056521
 to test https://github.com/Dasharo/flashrom/tree/kgpe-patch-rebase Pointing
 to https://github.com/Dasharo/flashrom/pull/11 so that CircleCI shows success
 where work is happening

Changes:
- "WARNERROR=no" is a env variable interpreted at compilation now, not a configuration option anymore
- To work around heads pkg-config, newer flashrom needs to have LIBS_BASE overriden to detect proper libusb and libpci as installed under heads/install
- INSTALL="$(INSTALL)" DESTDIR="$(INSTALL)" CFLAGS="-I$(INSTALL)/include/libusb-1.0 -I$(INSTALL)/include/pci" and LDFLAGS="-L$(INSTALL)/lib" needs to be passed as env variable  to build properly
- flashrom module now depends on libusb, since flashrom looks for pkg-config of installed libusb as prereq
---
 modules/flashrom | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/flashrom b/modules/flashrom
index 8c0c8d601..38c9ee4c2 100644
--- a/modules/flashrom
+++ b/modules/flashrom
@@ -2,26 +2,25 @@ modules-$(CONFIG_FLASHROM) += flashrom
 
 flashrom_depends := pciutils libusb $(musl_dep)
 
-flashrom_version := 82f021ec1e5677aec4c98352cf52695d82a0fb41
+flashrom_version := 5111246d8dab57249148e08509b58e9f82056521
 flashrom_dir := flashrom-$(flashrom_version)
 flashrom_tar := $(flashrom_dir).tar.gz
 flashrom_url := https://github.com/Dasharo/flashrom/archive/$(flashrom_version).tar.gz
-flashrom_hash := 027d77ffbcaed019197b90c5c0d8ba31c7d04fd5503eba1f3e88b907f67f0ab9
+flashrom_hash := ed36cd80c468f99680092cc009520ab301922b97e63d96936ac0b44831f6573a
 
 # Default options for flashrom
 flashrom_cfg := \
-	WARNERROR=no \
 	CONFIG_NOTHING=yes \
 	CONFIG_INTERNAL=yes \
-	CONFIG_INTERNAL_X86=yes \
 	CONFIG_DUMMY=yes \
 	CONFIG_AST1100=yes \
 
 ifeq "$(CONFIG_TARGET_ARCH)" "ppc64"
 flashrom_cfg := \
-	WARNERROR=no \
 	CONFIG_NOTHING=yes \
-	CONFIG_LINUX_MTD=yes
+	CONFIG_LINUX_MTD=yes \
+	CONFIG_DUMMY=yes \
+	CONFIG_AST2400=yes
 endif
 
 flashrom_target := \
@@ -32,8 +31,11 @@ flashrom_target := \
 	LIBS_BASE="$(INSTALL)" \
 	CFLAGS="-I$(INSTALL)/include/libusb-1.0 -I$(INSTALL)/include/pci" \
 	LDFLAGS="-L$(INSTALL)/lib" \
-	$(flashrom_cfg) \
+	WARNERROR=no \
 	$(CROSS_TOOLS) \
+	#PREFIX="/" \
+	#DESTDIR="$(INSTALL)" \
+	$(flashrom_cfg)
 
 flashrom_output := \
 	flashrom