Skip to content

Commit a4b0c6c

Browse files
committed
WiP: Transcient build test of flashrom against Dasharo/flashrom@5111246 to test https://github.com/Dasharo/flashrom/tree/kgpe-patch-rebase
Pointing to Dasharo/flashrom#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
1 parent 1c68bef commit a4b0c6c

File tree

2 files changed

+14
-1104
lines changed

2 files changed

+14
-1104
lines changed

modules/flashrom

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,40 @@
11
modules-$(CONFIG_FLASHROM) += flashrom
22

3-
flashrom_depends := pciutils $(musl_dep)
3+
flashrom_depends := pciutils libusb $(musl_dep)
44

5-
flashrom_version := b1f858f65b2abd276542650d8cb9e382da258967
5+
flashrom_version := 5111246d8dab57249148e08509b58e9f82056521
66
flashrom_dir := flashrom-$(flashrom_version)
77
flashrom_tar := $(flashrom_dir).tar.gz
8-
flashrom_url := https://github.com/flashrom/flashrom/archive/$(flashrom_version).tar.gz
9-
flashrom_hash := 4873ad50f500629c244fc3fbee64b56403a82307d7f555dfa235336a200c336c
8+
flashrom_url := https://github.com/Dasharo/flashrom/archive/$(flashrom_version).tar.gz
9+
flashrom_hash := ed36cd80c468f99680092cc009520ab301922b97e63d96936ac0b44831f6573a
1010

1111
# Default options for flashrom
1212
flashrom_cfg := \
13-
WARNERROR=no \
1413
CONFIG_NOTHING=yes \
1514
CONFIG_INTERNAL=yes \
1615
CONFIG_DUMMY=yes \
1716
CONFIG_AST1100=yes \
1817

1918
ifeq "$(CONFIG_TARGET_ARCH)" "ppc64"
2019
flashrom_cfg := \
21-
WARNERROR=no \
2220
CONFIG_NOTHING=yes \
2321
CONFIG_LINUX_MTD=yes \
2422
CONFIG_DUMMY=yes \
25-
CONFIG_AST1100=yes
23+
CONFIG_AST2400=yes
2624
endif
2725

2826
flashrom_target := \
2927
$(MAKE_JOBS) \
28+
PREFIX="$(INSTALL)" \
29+
INSTALL="$(INSTALL)" \
30+
DESTDIR="$(INSTALL)" \
31+
LIBS_BASE="$(INSTALL)" \
32+
CFLAGS="-I$(INSTALL)/include/libusb-1.0 -I$(INSTALL)/include/pci" \
33+
LDFLAGS="-L$(INSTALL)/lib" \
34+
WARNERROR=no \
3035
$(CROSS_TOOLS) \
36+
#PREFIX="/" \
37+
#DESTDIR="$(INSTALL)" \
3138
$(flashrom_cfg)
3239

3340
flashrom_output := \

0 commit comments

Comments
 (0)