From c301d148b3add4b5c1c3973a858ad624e4f85388 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 24 Jan 2023 10:13:47 -0500 Subject: [PATCH] flashrom ppc64: remove ast2400 and dummy, leaving NOTHING+MTD only, dasharo/flashrom commit 1011196105de9abcd025a3d8158d50fa6dc71011 NOTE: newer flashrom version seems to need to have environment variables defined prior of make call on console, not passing options at make call Attempt to get successful builds for https://github.com/Dasharo/flashrom/pull/11 CONFIG_INTERNAL is not enough to have internal programmer anymore. CONFIG_INTERNAL_X86 also needs to be requested. Bug upstream which is not tested against NOTHING --- modules/flashrom | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/flashrom b/modules/flashrom index 38c9ee4c2..6545bd870 100644 --- a/modules/flashrom +++ b/modules/flashrom @@ -2,25 +2,26 @@ modules-$(CONFIG_FLASHROM) += flashrom flashrom_depends := pciutils libusb $(musl_dep) -flashrom_version := 5111246d8dab57249148e08509b58e9f82056521 +flashrom_version := 1011196105de9abcd025a3d8158d50fa6dc71011 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 := ed36cd80c468f99680092cc009520ab301922b97e63d96936ac0b44831f6573a +flashrom_hash := f72912a5f5f2c2ad9985023c89ce2182b5ecec0df474cac352b21b1d46b8f880 # 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_DUMMY=yes \ - CONFIG_AST2400=yes + CONFIG_LINUX_MTD=yes endif flashrom_target := \ @@ -31,11 +32,8 @@ flashrom_target := \ LIBS_BASE="$(INSTALL)" \ CFLAGS="-I$(INSTALL)/include/libusb-1.0 -I$(INSTALL)/include/pci" \ LDFLAGS="-L$(INSTALL)/lib" \ - WARNERROR=no \ + $(flashrom_cfg) \ $(CROSS_TOOLS) \ - #PREFIX="/" \ - #DESTDIR="$(INSTALL)" \ - $(flashrom_cfg) flashrom_output := \ flashrom