GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sec/intel/txt/Makefile.inc: Include ACMs using Kconfig variables 

The Kconfig variables are used in the C code for cbfs file names but
not in the Makefiles adding them.

Change-Id: Ie35508d54ae91292f06de9827f0fb543ad81734d
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46454
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Arthur Heymans 2020-10-15 11:14:15 +02:00 committed by Angel Pons
parent 6ad856825a
commit ccb1119738
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/security/intel/txt/Makefile.inc
View File

@ -9,24 +9,25 @@ ramstage-y += getsec_enteraccs.S
ramstage-y += ramstage.c ramstage-y += ramstage.c
ramstage-$(CONFIG_INTEL_TXT_LOGGING) += logging.c ramstage-$(CONFIG_INTEL_TXT_LOGGING) += logging.c
cbfs-files-y += txt_bios_acm.bin cbfs-files-y += $(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)
txt_bios_acm.bin-file := $(CONFIG_INTEL_TXT_BIOSACM_FILE) $(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-file := $(CONFIG_INTEL_TXT_BIOSACM_FILE)
txt_bios_acm.bin-type := raw $(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-type := raw
txt_bios_acm.bin-align := $(CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT) $(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-align := $(CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT)
ifneq ($(CONFIG_INTEL_TXT_SINITACM_FILE),"") ifneq ($(CONFIG_INTEL_TXT_SINITACM_FILE),"")
cbfs-files-y += txt_sinit_acm.bin cbfs-files-y += $(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)
txt_sinit_acm.bin-file := $(CONFIG_INTEL_TXT_SINITACM_FILE) $(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-file := $(CONFIG_INTEL_TXT_SINITACM_FILE)
txt_sinit_acm.bin-type := raw $(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-type := raw
txt_sinit_acm.bin-align := 0x10 $(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-align := 0x10
txt_sinit_acm.bin-compression := lzma $(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-compression := lzma
endif endif
ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y) ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y)
INTERMEDIATE+=add_acm_fit INTERMEDIATE+=add_acm_fit
add_acm_fit: $(obj)/coreboot.pre $(IFITTOOL) add_acm_fit: $(obj)/coreboot.pre $(IFITTOOL)
$(IFITTOOL) -r COREBOOT -a -n txt_bios_acm.bin -t 2 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $< $(IFITTOOL) -r COREBOOT -a -n $(CONFIG_INTEL_TXT_CBFS_BIOS_ACM) -t 2 \
-s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $<
# Initial BootBlock files # Initial BootBlock files
ibb-files := $(foreach file,$(cbfs-files), \ ibb-files := $(foreach file,$(cbfs-files), \