[coreboot-gerrit] Change in coreboot[master]: drivers/intel/fsp2_0: Add FSP_ALIGNMENT_FSP_X option

[Raul Rangel (Code Review)]

Attention is currently required from: Andrey Petrov, Patrick Rudolph.
Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58986 )

Change subject: drivers/intel/fsp2_0: Add FSP_ALIGNMENT_FSP_X option
......................................................................

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
---
M src/drivers/intel/fsp2_0/Kconfig
M src/drivers/intel/fsp2_0/Makefile.inc
2 files changed, 16 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/58986/1

diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig
index ba93baa..a0e02a8 100644
--- a/src/drivers/intel/fsp2_0/Kconfig
+++ b/src/drivers/intel/fsp2_0/Kconfig
@@ -218,6 +218,16 @@
    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 92ebf24..4b3fb05 100644
--- a/src/drivers/intel/fsp2_0/Makefile.inc
+++ b/src/drivers/intel/fsp2_0/Makefile.inc
@@ -65,6 +65,9 @@
 ifeq ($(CONFIG_FSP_COMPRESS_FSP_M_LZ4),y)
 $(FSP_M_CBFS)-compression := LZ4
 endif
+ifneq ($(CONFIG_FSP_ALIGNMENT_FSP_M),)
+$(FSP_M_CBFS)-alignment := $(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 @@
 ifeq ($(CONFIG_FSP_COMPRESS_FSP_S_LZ4),y)
 $(FSP_S_CBFS)-compression := LZ4
 endif
+ifneq ($(CONFIG_FSP_ALIGNMENT_FSP_S),)
+$(FSP_S_CBFS)-alignment := $(CONFIG_FSP_ALIGNMENT_FSP_S)
+endif

ifeq ($(CONFIG_FSP_FULL_FD),y)
 $(obj)/Fsp_M.fd: $(call strip_quotes,$(CONFIG_FSP_FD_PATH)) $(DOTCONFIG)