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.

Sign up for GitHub

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

Jump to bottom

dasharo flashrom: remove dummy and mtd for x86, put ast1100 as optional #1420

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

dasharo flashrom: remove dummy and mtd for x86, put ast1100 as optional #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33551c8
flashrom now points to dasharo/flashrom master at https://github.com/…
tlaurion Dec 1, 2022
dc12f47
modules/flashrom: passing optimization for size (-Os)
tlaurion Feb 22, 2023
0bcafbf
flashrom: remove dummy, mtd and ast1100 on default builds to x86.
tlaurion Jun 23, 2023
e90d70b
kgpe-d16 boards: add CONFIG_FLASHROM_AST1100 as config option
tlaurion Jun 23, 2023
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
1 change: 1 addition & 0 deletions boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config

CONFIG_CRYPTSETUP=y
CONFIG_FLASHROM=y
CONFIG_FLASHROM_AST1100=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
CONFIG_KEXEC=y
Expand Down
1 change: 1 addition & 0 deletions boards/kgpe-d16_server/kgpe-d16_server.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server.config

CONFIG_CRYPTSETUP=y
CONFIG_FLASHROM=y
CONFIG_FLASHROM_AST1100=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
CONFIG_KEXEC=y
Expand Down
1 change: 1 addition & 0 deletions boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config

CONFIG_CRYPTSETUP=y
CONFIG_FLASHROM=y
CONFIG_FLASHROM_AST1100=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
CONFIG_KEXEC=y
Expand Down
1 change: 1 addition & 0 deletions boards/kgpe-d16_workstation/kgpe-d16_workstation.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config

CONFIG_CRYPTSETUP=y
CONFIG_FLASHROM=y
CONFIG_FLASHROM_AST1100=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
CONFIG_KEXEC=y
Expand Down
30 changes: 20 additions & 10 deletions modules/flashrom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,44 @@
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_DUMMY=yes \
CONFIG_AST1100=yes \
CONFIG_INTERNAL_X86=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

#Only enable AST1100 if requested per board configs
ifeq "$(CONFIG_FLASHROM_AST1100)" "y"
flashrom_cfg += CONFIG_AST1100=yes
endif



flashrom_target := \
$(MAKE_JOBS) \
PREFIX="$(INSTALL)" \
INSTALL="$(INSTALL)" \
DESTDIR="$(INSTALL)" \
LIBS_BASE="$(INSTALL)" \
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