From 82897c9c4f15880a7efa21c4e11a0929975384a1 Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Fri, 5 Nov 2021 10:29:24 -0600 Subject: drivers/intel/fsp2_0: Add FSP_ALIGNMENT_FSP_X option This option will allow setting the FSP alignment in CBFS. BUG=b:179699789 TEST=Boot with and without the option set and verify -a option was passed. Signed-off-by: Raul E Rangel Change-Id: I4533f6c9d56bea6520aa3aa87dd49f2144a23850 Reviewed-on: https://review.coreboot.org/c/coreboot/+/58986 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/drivers/intel/fsp2_0/Kconfig | 10 ++++++++++ src/drivers/intel/fsp2_0/Makefile.inc | 6 ++++++ 2 files changed, 16 insertions(+) (limited to 'src') diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig index ba93baa4de..a0e02a83ca 100644 --- a/src/drivers/intel/fsp2_0/Kconfig +++ b/src/drivers/intel/fsp2_0/Kconfig @@ -218,6 +218,16 @@ config FSP_COMPRESS_FSP_M_LZ4 bool depends on !FSP_M_XIP +config FSP_ALIGNMENT_FSP_S + int + help + Sets the CBFS alignment for FSP-S + +config FSP_ALIGNMENT_FSP_M + int + help + Sets the CBFS alignment for FSP-M + config FSP_M_ADDR hex help diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc index 92ebf24e5d..eaf99d1492 100644 --- a/src/drivers/intel/fsp2_0/Makefile.inc +++ b/src/drivers/intel/fsp2_0/Makefile.inc @@ -65,6 +65,9 @@ endif ifeq ($(CONFIG_FSP_COMPRESS_FSP_M_LZ4),y) $(FSP_M_CBFS)-compression := LZ4 endif +ifneq ($(CONFIG_FSP_ALIGNMENT_FSP_M),) +$(FSP_M_CBFS)-align := $(CONFIG_FSP_ALIGNMENT_FSP_M) +endif cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += $(FSP_S_CBFS) $(FSP_S_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_S_FILE)) @@ -75,6 +78,9 @@ endif ifeq ($(CONFIG_FSP_COMPRESS_FSP_S_LZ4),y) $(FSP_S_CBFS)-compression := LZ4 endif +ifneq ($(CONFIG_FSP_ALIGNMENT_FSP_S),) +$(FSP_S_CBFS)-align := $(CONFIG_FSP_ALIGNMENT_FSP_S) +endif ifeq ($(CONFIG_FSP_FULL_FD),y) $(obj)/Fsp_M.fd: $(call strip_quotes,$(CONFIG_FSP_FD_PATH)) $(DOTCONFIG) -- cgit v1.2.3