Change in coreboot[master]: sec/intel/txt/Makefile.inc: Include ACMs using Kconfig variables
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46454 )
Change subject: sec/intel/txt/Makefile.inc: Include ACMs using Kconfig variables ......................................................................
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 --- M src/security/intel/txt/Makefile.inc 1 file changed, 11 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/46454/1
diff --git a/src/security/intel/txt/Makefile.inc b/src/security/intel/txt/Makefile.inc index 39c3ad1..712ab58 100644 --- a/src/security/intel/txt/Makefile.inc +++ b/src/security/intel/txt/Makefile.inc @@ -9,24 +9,25 @@ ramstage-y += ramstage.c ramstage-$(CONFIG_INTEL_TXT_LOGGING) += logging.c
-cbfs-files-y += txt_bios_acm.bin -txt_bios_acm.bin-file := $(CONFIG_INTEL_TXT_BIOSACM_FILE) -txt_bios_acm.bin-type := raw -txt_bios_acm.bin-align := $(CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT) +cbfs-files-y += $(CONFIG_INTEL_TXT_CBFS_BIOS_ACM) +$(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-file := $(CONFIG_INTEL_TXT_BIOSACM_FILE) +$(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-type := raw +$(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-align := $(CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT)
ifneq ($(CONFIG_INTEL_TXT_SINITACM_FILE),"") -cbfs-files-y += txt_sinit_acm.bin -txt_sinit_acm.bin-file := $(CONFIG_INTEL_TXT_SINITACM_FILE) -txt_sinit_acm.bin-type := raw -txt_sinit_acm.bin-align := 0x10 -txt_sinit_acm.bin-compression := lzma +cbfs-files-y += $(CONFIG_INTEL_TXT_CBFS_SINIT_ACM) +$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-file := $(CONFIG_INTEL_TXT_SINITACM_FILE) +$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-type := raw +$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-align := 0x10 +$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-compression := lzma endif
ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y)
INTERMEDIATE+=add_acm_fit 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 ibb-files := $(foreach file,$(cbfs-files), \
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46454 )
Change subject: sec/intel/txt/Makefile.inc: Include ACMs using Kconfig variables ......................................................................
Patch Set 1: Code-Review+2
Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46454 )
Change subject: sec/intel/txt/Makefile.inc: Include ACMs using Kconfig variables ......................................................................
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 --- M src/security/intel/txt/Makefile.inc 1 file changed, 11 insertions(+), 10 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/security/intel/txt/Makefile.inc b/src/security/intel/txt/Makefile.inc index 39c3ad1..712ab58 100644 --- a/src/security/intel/txt/Makefile.inc +++ b/src/security/intel/txt/Makefile.inc @@ -9,24 +9,25 @@ ramstage-y += ramstage.c ramstage-$(CONFIG_INTEL_TXT_LOGGING) += logging.c
-cbfs-files-y += txt_bios_acm.bin -txt_bios_acm.bin-file := $(CONFIG_INTEL_TXT_BIOSACM_FILE) -txt_bios_acm.bin-type := raw -txt_bios_acm.bin-align := $(CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT) +cbfs-files-y += $(CONFIG_INTEL_TXT_CBFS_BIOS_ACM) +$(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-file := $(CONFIG_INTEL_TXT_BIOSACM_FILE) +$(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-type := raw +$(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-align := $(CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT)
ifneq ($(CONFIG_INTEL_TXT_SINITACM_FILE),"") -cbfs-files-y += txt_sinit_acm.bin -txt_sinit_acm.bin-file := $(CONFIG_INTEL_TXT_SINITACM_FILE) -txt_sinit_acm.bin-type := raw -txt_sinit_acm.bin-align := 0x10 -txt_sinit_acm.bin-compression := lzma +cbfs-files-y += $(CONFIG_INTEL_TXT_CBFS_SINIT_ACM) +$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-file := $(CONFIG_INTEL_TXT_SINITACM_FILE) +$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-type := raw +$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-align := 0x10 +$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-compression := lzma endif
ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y)
INTERMEDIATE+=add_acm_fit 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 ibb-files := $(foreach file,$(cbfs-files), \
-
Angel Pons (Code Review) -
Arthur Heymans (Code Review)