Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WiP: Switch master flashrom to dasharo/flashrom #1251

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 \
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try removing CONFIG_INTERNAL

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)" \
tlaurion marked this conversation as resolved.
Show resolved Hide resolved
CFLAGS="-Os -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