[coreboot-gerrit] Change in coreboot[master]: mb/amd/majolica: Add PSP support for board majolica

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48529
Reviewed-by: Felix Held 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/amd/majolica/Kconfig
M src/mainboard/amd/majolica/Makefile.inc
2 files changed, 10 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig
index 7e2301e..ce8a498 100644
--- a/src/mainboard/amd/majolica/Kconfig
+++ b/src/mainboard/amd/majolica/Kconfig
@@ -18,6 +18,12 @@
 config MAINBOARD_PART_NUMBER
    default "MAJOLICA"

+config AMD_FWM_POSITION_INDEX
+	int
+	default 4
+	help
+	  TODO: might need to be adapted for better placement of files in cbfs
+
 config MAJOLICA_HAVE_MCHP_FW
    bool "Have Microchip EC firmware?"
    default n
diff --git a/src/mainboard/amd/majolica/Makefile.inc b/src/mainboard/amd/majolica/Makefile.inc
index 8c35d9a..56eb6f2 100644
--- a/src/mainboard/amd/majolica/Makefile.inc
+++ b/src/mainboard/amd/majolica/Makefile.inc
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only

+APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_Updatable.bin
+APCB_SOURCES_68 = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_Updatable_68.bin
+APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_DefaultRecovery.bin
+
 ifeq ($(CONFIG_MAJOLICA_HAVE_MCHP_FW),y)
 $(call add_intermediate, add_mchp_fw)
    $(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_MAJOLICA_MCHP_FW_FILE) --fill-upward