commit e22d740971f557195af457cde2a4e7bc1f78c158
author Martin Roth <gaumless@gmail.com> Wed Mar 08 15:50:27 2023 -0700
committer Martin Roth <martin.roth@amd.corp-partner.google.com> Wed Mar 29 20:06:14 2023 +0000
tree eceb4f4c2af2c69457b6fd5a0e4bd8ed7a539c5e
parent fc709fee099b4035e0f5311a401cda886ad0d8a2

mb/google/skyrim: Get ready to add MP2 firmware

This sets the location of the skyrim MP2 firmware within the mainboard's
blobs directory, and adds the Kconfig option to the mainboard directory
so that it can be enabled in a saved .config file.

The skyrim MP2 firmware is skyrim specific, so it should not be placed
in the main PSP AMD_BLOBS directory.

We will also only want to enable the MP2 firmware for chromeos builds as
it's not useful for non-chromeos builds.

BUG=b:259554520
TEST=Build MP2 firmware into image, see that it gets loaded
BRANCH=skyrim

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: I04be6f2d0b605d4eca37fd927a70310259dc106c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73659
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Robert Zieba <robertzieba@google.com>
Reviewed-by: Jon Murphy <jpmurphy@google.com>

src/mainboard/google/skyrim/Kconfig

diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
index 823a949..f44937b 100644
--- a/src/mainboard/google/skyrim/Kconfig
+++ b/src/mainboard/google/skyrim/Kconfig
@@ -66,6 +66,11 @@
 	help
 	  Custom firmware list excluding the fwTPM binary.
 
+config PSP_LOAD_MP2_FW
+	prompt "Load MP2 Firmware"
+	depends on CHROMEOS
+	default n
+
 config HAVE_SPL_FILE
 	bool
 	default y

src/mainboard/google/skyrim/amdfw.cfg

diff --git a/src/mainboard/google/skyrim/amdfw.cfg b/src/mainboard/google/skyrim/amdfw.cfg
index 118d7c1..9c83a3f 100644
--- a/src/mainboard/google/skyrim/amdfw.cfg
+++ b/src/mainboard/google/skyrim/amdfw.cfg
@@ -30,10 +30,11 @@
 DMCUB_FILE                 TypeId0x71_DmcubFw_MDN.sbin
 PSPBTLDR_AB_FILE           TypeId0x73_PspBootLoader2_MDN.sbin
 TA_IKEK_FILE               TypeId0x8D_IkekTa_MDN.bin
+PSP_MP2FW2_FILE            3rdparty/blobs/mainboard/google/skyrim/TypeId0x25_Mp2Fw_MDN_AD03.sbin
 
 # BDT
 PSP_PMUI_FILE_SUB0_INS1    TypeId0x64_Appb_MDN_Lpddr5Imem1.csbin
 PSP_PMUD_FILE_SUB0_INS1    TypeId0x65_Appb_MDN_Lpddr5Dmem1.csbin
 PSP_PMUI_FILE_SUB0_INS2    TypeId0x64_Appb_MDN_Lpddr5Imem2.csbin
 PSP_PMUD_FILE_SUB0_INS2    TypeId0x65_Appb_MDN_Lpddr5Dmem2.csbin
-PSP_MP2CFG_FILE            TypeId0x6a_Mp2FwConfig_MDN.sbin
+PSP_MP2CFG_FILE            3rdparty/blobs/mainboard/google/skyrim/TypeId0x6A_ConfigFile.sbin