Skip to content

Commit

Permalink
Merge branch 'dasharo_flashrom_test' into O3-O2-to-Os_coreboot-4.19-f…
Browse files Browse the repository at this point in the history
…ix-sh_argument_expected-yubikey-oem-factory-reset_dasharo-flashrom

Daily driver test fo x230-hotp-maximized on coreboot 4.19, with debug, yubikey test regression for oem-factory-reset, optimized for space (03-O2->Os) and fix for sh: argument expected, with local CONFIG_DEBUG_OUTPUT enabled and fused in ROM.
    Includes linuxboot#1317, linuxboot#1121, linuxboot#1312, linuxboot#1305, linuxboot#1251 for test on daily driver
  • Loading branch information
tlaurion committed Feb 19, 2023
2 parents 5605b76 + 9ea4ef4 commit 16de2e2
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 := 82f021ec1e5677aec4c98352cf52695d82a0fb41
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 := 6ae2f42500dec92de9b7dc75ec304887bf4816b1ae28605fe53e67a0ae97a755

# 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 16de2e2

Please sign in to comment.