Skip to content

Commit

Permalink
WiP : Add ifdtool and cbfstool to experiment from Heads with cbmem/cb…
Browse files Browse the repository at this point in the history
…fstool/ifdtool to get same cbmem -L/TPM eventlog/introspection of PRC content equivalence

Signed-off-by: Thierry Laurion <[email protected]>
  • Loading branch information
tlaurion committed Dec 31, 2023
1 parent 408885c commit de389ac
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ $(foreach m, $(modules-y), \
)

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

$(COREBOOT_UTIL_DIR)/cbmem/cbmem \
$(COREBOOT_UTIL_DIR)/superiotool/superiotool \
$(COREBOOT_UTIL_DIR)/inteltool/inteltool \
$(COREBOOT_UTIL_DIR)/ifdtool_cross/ifdtool \
$(COREBOOT_UTIL_DIR)/cbfstool_cross/cbfstool \
: $(build)/$(coreboot_base_dir)/.canary musl-cross
+$(call do,MAKE,$(notdir $@),\
$(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \
Expand Down
1 change: 1 addition & 0 deletions modules/coreboot
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ $(coreboot_module)_configure := \
&& echo 'CONFIG_LOCALVERSION="$(BRAND_NAME)-$(HEADS_GIT_VERSION)"' >> $(build)/$(coreboot_dir)/.config \
&& echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(BOARD)"' >> $(build)/$(coreboot_dir)/.config \
&& cp -TRf --remove-destination $(build)/$(coreboot_base_dir)/util/ifdtool $(build)/$(coreboot_base_dir)/util/ifdtool_cross \
&& cp -TRf --remove-destination $(build)/$(coreboot_base_dir)/util/cbfstool $(build)/$(coreboot_base_dir)/util/cbfstool_cross \
&& $(MAKE) olddefconfig \
-C "$(build)/$(coreboot_base_dir)" \
obj="$(build)/$(coreboot_dir)" \
Expand Down

0 comments on commit de389ac

Please sign in to comment.