Skip to content

Commit

Permalink
flashrom now points to dasharo/flashrom master at Dasharo/flashrom@51…
Browse files Browse the repository at this point in the history
…11246 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
  • Loading branch information
tlaurion committed Jun 23, 2023
1 parent 2dcf7fb commit 33551c8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1,105 deletions.
21 changes: 13 additions & 8 deletions modules/flashrom
Original file line number Diff line number Diff line change
@@ -1,34 +1,39 @@
modules-$(CONFIG_FLASHROM) += flashrom

flashrom_depends := pciutils $(musl_dep)
flashrom_depends := pciutils libusb $(musl_dep)

flashrom_version := b1f858f65b2abd276542650d8cb9e382da258967
flashrom_version := 6b2061bc0699202f81aeb782f301f1bba9f8a826
flashrom_dir := flashrom-$(flashrom_version)
flashrom_tar := $(flashrom_dir).tar.gz
flashrom_url := https://github.com/flashrom/flashrom/archive/$(flashrom_version).tar.gz
flashrom_hash := 4873ad50f500629c244fc3fbee64b56403a82307d7f555dfa235336a200c336c
flashrom_url := https://github.com/Dasharo/flashrom/archive/$(flashrom_version).tar.gz
flashrom_hash := 1295be687e1d3806e1489671ad4e1abe1561e83010e43eff367a35dfb603ab51

# 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_AST1100=yes
CONFIG_LINUX_MTD=yes
endif

flashrom_target := \
$(MAKE_JOBS) \
PREFIX="$(INSTALL)" \
INSTALL="$(INSTALL)" \
DESTDIR="$(INSTALL)" \
LIBS_BASE="$(INSTALL)" \
CFLAGS="-I$(INSTALL)/include/libusb-1.0 -I$(INSTALL)/include/pci" \
LDFLAGS="-L$(INSTALL)/lib" \
$(flashrom_cfg) \
$(CROSS_TOOLS) \
$(flashrom_cfg)

flashrom_output := \
flashrom
Expand Down
Loading

0 comments on commit 33551c8

Please sign in to comment.