diff options
| author | Karthikeyan Ramasubramanian <kramasub@google.com> | 2022-08-16 17:30:06 -0600 |
|---|---|---|
| committer | Raul Rangel <rrangel@chromium.org> | 2022-10-26 15:56:37 +0000 |
| commit | 7835861f9d757dcfd00b1c9e51a3cce1f0876035 (patch) | |
| tree | 0817c22853e92b397f791e71204b1bd9197af35f | |
| parent | 8b86f21f4578bcf335a28af22c67187c3136cd7f (diff) | |
util/amdfwtool: Add build rules for amdfwread
Add build rules to build amdfwread tool. Also mark this as a dependency
either while building tools or amdfw.rom.
BUG=None
TEST=Build and boot to OS in Skyrim with CBFS verification enabled.
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Change-Id: I3fee4e4c77f62bb2840270b3eaaa58b894780d75
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66939
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | Makefile.inc | 3 | ||||
| -rw-r--r-- | src/soc/amd/common/Makefile.inc | 4 | ||||
| -rw-r--r-- | util/amdfwtool/Makefile.inc | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.inc b/Makefile.inc index 0ed205fb41..563a2bca37 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -600,6 +600,7 @@ BINCFG:=$(objutil)/bincfg/bincfg IFDTOOL:=$(objutil)/ifdtool/ifdtool AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool +AMDFWREAD:=$(objutil)/amdfwtool/amdfwread APCB_EDIT_TOOL:=$(top)/util/apcb/apcb_edit.py @@ -701,7 +702,7 @@ install-git-commit-clangfmt: include util/crossgcc/Makefile.inc .PHONY: tools -tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) $(objutil)/supermicro/smcbiosinfo $(CSE_FPT) $(CSE_SERGER) +tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) $(objutil)/supermicro/smcbiosinfo $(CSE_FPT) $(CSE_SERGER) $(AMDFWREAD) ########################################################################### # Common recipes for all stages diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc index a9355651cb..75b1142632 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/src/soc/amd/common/Makefile.inc @@ -14,4 +14,8 @@ DEP_FILES= $(patsubst %,$(FIRMWARE_LOCATION)/%, $(shell sed -e /^$(POUND_SIGN)/d amd_microcode_bins += $(wildcard ${FIRMWARE_LOCATION}/*UcodePatch_*.bin) +ifeq ($(CONFIG_VBOOT_GSCVD),y) +build_complete:: $(AMDFWREAD) +endif # ifeq ($(CONFIG_VBOOT_GSCVD),y) + endif diff --git a/util/amdfwtool/Makefile.inc b/util/amdfwtool/Makefile.inc index b61f02c06c..b9c3ced74d 100644 --- a/util/amdfwtool/Makefile.inc +++ b/util/amdfwtool/Makefile.inc @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause amdfwtoolobj = amdfwtool.o data_parse.o +amdfwreadobj = amdfwread.o AMDFWTOOLCFLAGS=-O2 -Wall -Wextra -Wshadow -Werror AMDFWTOOLCFLAGS += -I $(top)/src/commonlib/bsd/include @@ -16,3 +17,7 @@ $(objutil)/amdfwtool/%.o: $(top)/util/amdfwtool/%.c # $(HEADER) $(objutil)/amdfwtool/amdfwtool: $(addprefix $(objutil)/amdfwtool/,$(amdfwtoolobj)) printf " AMDFWTOOL\n" $(HOSTCC) $(addprefix $(objutil)/amdfwtool/,$(amdfwtoolobj)) $(LDFLAGS) -o $@ + +$(objutil)/amdfwtool/amdfwread: $(addprefix $(objutil)/amdfwtool/,$(amdfwreadobj)) + printf " AMDFWREAD\n" + $(HOSTCC) $(addprefix $(objutil)/amdfwtool/,$(amdfwreadobj)) $(LDFLAGS) -o $@ |