Rizwan Qureshi has uploaded this change for review. ( https://review.coreboot.org/27151
Change subject: Kconfig: config to insert ucode address in second FIT ......................................................................
Kconfig: config to insert ucode address in second FIT
Add a config to insert the address of a FMAP region (which should hold a microcode) as the first entry in the second FIT.
Change-Id: I4ee41d90bae34862aa68c9b8bd69288de1335585 Signed-off-by: Rizwan Qureshi rizwan.qureshi@intel.com --- M Makefile.inc M src/soc/intel/Kconfig 2 files changed, 15 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/27151/1
diff --git a/Makefile.inc b/Makefile.inc index 16d6f18..f8e134e 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1005,6 +1005,10 @@ $(RMODTOOL) -i $(CONFIG_REFCODE_BLOB_FILE) -o $@ endif
+ifneq ($(CONFIG_TOP_SWAP_FIT_ENTRY),"") +FIT_OPTIONS := -j $(CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE) -q $(CONFIG_TOP_SWAP_FIT_ENTRY) +endif + $(obj)/coreboot.rom: $(obj)/coreboot.pre $(objcbfs)/ramstage.elf $(CBFSTOOL) $$(INTERMEDIATE) @printf " CBFS $(subst $(obj)/,,$(@))\n" # The full ROM may be larger than the CBFS part, so create an empty @@ -1022,12 +1026,14 @@ ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y) ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER),y) @printf " UPDATE-FIT\n" - $(CBFSTOOL) $@.tmp update-fit -n cpu_microcode_blob.bin -x $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) + $(CBFSTOOL) $@.tmp update-fit -n cpu_microcode_blob.bin -x $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) \ + $(FIT_OPTIONS) endif
ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE),y) @printf " UPDATE-FIT\n" - $(CBFSTOOL) $@.tmp update-fit -n cpu_microcode_blob.bin -x $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) + $(CBFSTOOL) $@.tmp update-fit -n cpu_microcode_blob.bin -x $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) \ + $(FIT_OPTIONS) endif endif mv $@.tmp $@ diff --git a/src/soc/intel/Kconfig b/src/soc/intel/Kconfig index a80101a..1e4b1c5 100644 --- a/src/soc/intel/Kconfig +++ b/src/soc/intel/Kconfig @@ -28,3 +28,10 @@ hex depends on INTEL_TOP_SWAP_BOOTBLOCK default C_ENV_BOOTBLOCK_SIZE if C_ENVIRONMENT_BOOTBLOCK + +config TOP_SWAP_FIT_ENTRY + string + depends on INTEL_TOP_SWAP_BOOTBLOCK + help + Use thi config to insert the address of a FMAP region (which should + hold a microcode) as the first entry in the second FIT.