Skip to content

Commit 0dad53c

Browse files
committed
flashrom now points to dasharo/flashrom master at Dasharo/flashrom@5111246 from work under 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~ fixed upstream in previous commits - 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 - flashrom ppc64: remove ast2400 and dummy, leaving NOTHING+MTD only NOTES: - newer flashrom version seems to need to have environment variables defined prior of make call on console, not passing options at make call - CONFIG_INTERNAL is not enough to have internal programmer anymore on x86. CONFIG_INTERNAL_X86 also needs to be requested. Collaboration happened under Dasharo/flashrom#11
1 parent 8b479b0 commit 0dad53c

File tree

2 files changed

+13
-1105
lines changed

2 files changed

+13
-1105
lines changed

modules/flashrom

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,39 @@
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 := 6b2061bc0699202f81aeb782f301f1bba9f8a826
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 := 1295be687e1d3806e1489671ad4e1abe1561e83010e43eff367a35dfb603ab51
1010

1111
# Default options for flashrom
1212
flashrom_cfg := \
1313
WARNERROR=no \
1414
CONFIG_NOTHING=yes \
1515
CONFIG_INTERNAL=yes \
16+
CONFIG_INTERNAL_X86=yes \
1617
CONFIG_DUMMY=yes \
1718
CONFIG_AST1100=yes \
1819

1920
ifeq "$(CONFIG_TARGET_ARCH)" "ppc64"
2021
flashrom_cfg := \
2122
WARNERROR=no \
2223
CONFIG_NOTHING=yes \
23-
CONFIG_LINUX_MTD=yes \
24-
CONFIG_DUMMY=yes \
25-
CONFIG_AST1100=yes
24+
CONFIG_LINUX_MTD=yes
2625
endif
2726

2827
flashrom_target := \
2928
$(MAKE_JOBS) \
29+
PREFIX="$(INSTALL)" \
30+
INSTALL="$(INSTALL)" \
31+
DESTDIR="$(INSTALL)" \
32+
LIBS_BASE="$(INSTALL)" \
33+
CFLAGS="-I$(INSTALL)/include/libusb-1.0 -I$(INSTALL)/include/pci" \
34+
LDFLAGS="-L$(INSTALL)/lib" \
35+
$(flashrom_cfg) \
3036
$(CROSS_TOOLS) \
31-
$(flashrom_cfg)
3237

3338
flashrom_output := \
3439
flashrom

0 commit comments

Comments
 (0)