[coreboot-gerrit] [S] Change in coreboot[master]: morgana & birman: Add support

[Bao Zheng (Code Review)]

Attention is currently required from: Zheng Bao.

Hello Zheng Bao,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/69469

to review the following change.

Change subject: morgana & birman: Add support
......................................................................

morgana & birman: Add support

Change-Id: I990b67c508766644e03571d9294d9e9766b53435
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/birman/Makefile.inc
M src/soc/amd/morgana/Makefile.inc
2 files changed, 23 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/69469/1

diff --git a/src/mainboard/amd/birman/Makefile.inc b/src/mainboard/amd/birman/Makefile.inc
index b0466e7..4ab875c 100644
--- a/src/mainboard/amd/birman/Makefile.inc
+++ b/src/mainboard/amd/birman/Makefile.inc
@@ -9,9 +9,9 @@
 ramstage-y += chromeos.c
 ramstage-y += gpio.c

-ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_Updatable.bin),)
-APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_Updatable.bin
-APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_DefaultRecovery.bin
+ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_FP8_DDR5_Updatable.bin),)
+APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_FP8_DDR5_Updatable.bin
+APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_FP8_DDR5_DefaultRecovery.bin
 else
 $(info APCB sources not found. Skipping APCB. The resulting image won't boot.)
 endif
diff --git a/src/soc/amd/morgana/Makefile.inc b/src/soc/amd/morgana/Makefile.inc
index f4243bc..4ca7325 100644
--- a/src/soc/amd/morgana/Makefile.inc
+++ b/src/soc/amd/morgana/Makefile.inc
@@ -98,21 +98,24 @@
 PSP_SOFTFUSE_BITS += 7
 endif

-ifeq ($(CONFIG_PSP_UNLOCK_SECURE_DEBUG),y)
+#ifeq ($(CONFIG_PSP_UNLOCK_SECURE_DEBUG),y)
 # Enable secure debug unlock
 PSP_SOFTFUSE_BITS += 0
 OPT_TOKEN_UNLOCK="--token-unlock"
-endif
+#endif

-ifeq ($(CONFIG_PSP_LOAD_MP2_FW),y)
+#ifeq ($(CONFIG_PSP_LOAD_MP2_FW),y)
 OPT_PSP_LOAD_MP2_FW="--load-mp2-fw"
-else
+#else
 # Disable MP2 firmware loading
-PSP_SOFTFUSE_BITS += 29
-endif
+#PSP_SOFTFUSE_BITS += 29
+#endif

# Use additional Soft Fuse bits specified in Kconfig
-PSP_SOFTFUSE_BITS += $(call strip_quotes, $(CONFIG_PSP_SOFTFUSE_BITS))
+#PSP_SOFTFUSE_BITS += $(call strip_quotes, $(CONFIG_PSP_SOFTFUSE_BITS))
+
+PSP_SOFTFUSE_BITS += 14
+PSP_SOFTFUSE_BITS += 15

# type = 0x3a
 ifeq ($(CONFIG_HAVE_PSP_WHITELIST_FILE),y)