Skip to content

Commit 5bcd6cd

Browse files
committed
WiP : Add ifdtool and cbfstool to experiment from Heads with cbmem/cbfstool/ifdtool to get same cbmem -L/TPM eventlog/introspection of PRC content equivalence
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent 7007d18 commit 5bcd6cd

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ $(foreach m, $(modules-y), \
585585
)
586586

587587
#
588-
# hack to build cbmem and ifdtool from coreboot
588+
# hack to build cbmem, cbfstool and ifdtool from coreboot
589589
# this must be built *AFTER* musl, but since coreboot depends on other things
590590
# that depend on musl it should be ok.
591591
#
@@ -599,14 +599,16 @@ ifeq ($(CONFIG_NVMUTIL),y)
599599
# We consequently need ifdtool packed under initrd with cross-compiler
600600
# coreboot module copied ifdtool into ifdtool_cross at configure step
601601
# so that coreboot builds its own and we ask one to be cross-build and packed here
602-
$(eval $(call initrd_bin_add,$(COREBOOT_UTIL_DIR)/ifdtool_cross/ifdtool))
602+
$(eval $(call initrd_bin_add,$(COREBOOT_UTIL_DIR)/ifdtool_cross/ifdtool))
603+
$(eval $(call initrd_bin_add,$(COREBOOT_UTIL_DIR)/cbfstool_cross/cbfstool))
603604
endif
604605
endif
605606

606607
$(COREBOOT_UTIL_DIR)/cbmem/cbmem \
607608
$(COREBOOT_UTIL_DIR)/superiotool/superiotool \
608609
$(COREBOOT_UTIL_DIR)/inteltool/inteltool \
609610
$(COREBOOT_UTIL_DIR)/ifdtool_cross/ifdtool \
611+
$(COREBOOT_UTIL_DIR)/cbfstool_cross/cbfstool \
610612
: $(build)/$(coreboot_base_dir)/.canary musl-cross
611613
+$(call do,MAKE,$(notdir $@),\
612614
$(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \

modules/coreboot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ $(coreboot_module)_configure := \
139139
&& echo 'CONFIG_LOCALVERSION="$(BRAND_NAME)-$(HEADS_GIT_VERSION)"' >> $(build)/$(coreboot_dir)/.config \
140140
&& echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(BOARD)"' >> $(build)/$(coreboot_dir)/.config \
141141
&& cp -TRf --remove-destination $(build)/$(coreboot_base_dir)/util/ifdtool $(build)/$(coreboot_base_dir)/util/ifdtool_cross \
142+
&& cp -TRf --remove-destination $(build)/$(coreboot_base_dir)/util/cbfstool $(build)/$(coreboot_base_dir)/util/cbfstool_cross \
142143
&& $(MAKE) olddefconfig \
143144
-C "$(build)/$(coreboot_base_dir)" \
144145
obj="$(build)/$(coreboot_dir)" \

0 commit comments

Comments
 (0)