From f773a0faaccc8d2aa5192f923fe44527f20ee04e Mon Sep 17 00:00:00 2001 From: Sergii Dmytruk Date: Tue, 9 Dec 2025 16:29:55 +0200 Subject: [PATCH] cpu/intel/fit/Makefile.mk: make FIT in TOPSWAP point at MCU in COREBOOT_TS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a correction of CB:89570 (commit 04ea4724e2d0 ("Makefile.mk: separate bootblocks into BOOTBLOCK and TOPSWAP")) which has FITs in both BOOTBLOCK and TOPSWAP point at microcode in COREBOOT region. This can be tested by comparing outputs of build/util/cbfstool/ifittool -f build/coreboot.rom -r TOPSWAP -D and build/util/cbfstool/ifittool -f build/coreboot.rom -r BOOTBLOCK -D with microcode addresses as shown by uefitool build/coreboot.rom The addresses in two regions must not be identical and their last six hex digits must match what uefitool shows in "Base:" field (not "Offset:"). Change-Id: Ie37aee7a26be18d1a4d8993afd2a2484c38c0b1e Signed-off-by: Sergii Dmytruk Reviewed-on: https://review.coreboot.org/c/coreboot/+/90434 Tested-by: build bot (Jenkins) Reviewed-by: Filip Gołaś Reviewed-by: Michał Kopeć Reviewed-by: Filip Lewiński --- src/cpu/intel/fit/Makefile.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cpu/intel/fit/Makefile.mk b/src/cpu/intel/fit/Makefile.mk index 2729c0a6ae..1594f45a4e 100644 --- a/src/cpu/intel/fit/Makefile.mk +++ b/src/cpu/intel/fit/Makefile.mk @@ -16,6 +16,10 @@ intel_fit-align := 16 ifeq ($(CONFIG_INTEL_TOP_SWAP_SEPARATE_REGIONS),y) regions-for-file-intel_fit = BOOTBLOCK regions-for-file-intel_fit_ts = TOPSWAP + +TS_MCU_REGION = COREBOOT_TS +else +TS_MCU_REGION = COREBOOT endif $(call add_intermediate, set_fit_ptr, $(IFITTOOL)) @@ -45,7 +49,7 @@ $(call add_intermediate, add_ts_mcu_fit, set_ts_fit_ptr $(IFITTOOL)) ifneq ($(FIT_ENTRY),) $(IFITTOOL) -f $< -A -n $(FIT_ENTRY) -t 1 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) $(TS_OPTIONS) -r $(TS_FIT_REGION) endif # FIT_ENTRY - $(IFITTOOL) -f $< -a -n cpu_microcode_blob.bin -t 1 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) $(TS_OPTIONS) -r $(TS_FIT_REGION) -R COREBOOT + $(IFITTOOL) -f $< -a -n cpu_microcode_blob.bin -t 1 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) $(TS_OPTIONS) -r $(TS_FIT_REGION) -R $(TS_MCU_REGION) cbfs-files-y += intel_fit_ts intel_fit_ts-file := fit_table.c:struct