From 372c4151d4423788e597c1fdf90e003ce4226649 Mon Sep 17 00:00:00 2001 From: Robert Zieba Date: Thu, 19 Jan 2023 21:02:39 +0000 Subject: [PATCH] mainboard/google/skyrim: Enable MP2 FW loading This board will use custom MP2 FW to dump the contents of the STB when the SOC fails to enter/exit S0i3. Enable `PSP_LOAD_MP2_FW` by default. BUG=b:259554520 TEST=Built and ran on skyrim device, verified that MP2 FW loads. Change-Id: I4222521d01e2c98708f0e5b6693a8aee9e59edf2 Signed-off-by: Robert Zieba Reviewed-on: https://review.coreboot.org/c/coreboot/+/72118 Reviewed-by: Karthik Ramasubramanian Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) --- src/mainboard/google/skyrim/Kconfig | 2 +- src/mainboard/google/skyrim/amdfw.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig index 44ecfc4699..53dfd53966 100644 --- a/src/mainboard/google/skyrim/Kconfig +++ b/src/mainboard/google/skyrim/Kconfig @@ -71,7 +71,7 @@ config AMDFW_CONFIG_FILE config PSP_LOAD_MP2_FW prompt "Load MP2 Firmware" depends on CHROMEOS - default n + default y config HAVE_SPL_FILE bool diff --git a/src/mainboard/google/skyrim/amdfw.cfg b/src/mainboard/google/skyrim/amdfw.cfg index 01e36abaa9..63aed0c6f2 100644 --- a/src/mainboard/google/skyrim/amdfw.cfg +++ b/src/mainboard/google/skyrim/amdfw.cfg @@ -29,11 +29,11 @@ SPIROM_CONFIG_FILE TypeId0x5C_SpiRomConfig_MDN_Dual66.sbin DMCUB_FILE TypeId0x71_DmcubFw_MDN.sbin PSPBTLDR_AB_FILE TypeId0x73_PspBootLoader2_MDN.sbin TA_IKEK_FILE TypeId0x8D_IkekTa_MDN.bin -PSP_MP2FW0_FILE 3rdparty/blobs/mainboard/google/skyrim/TypeId0x25_Mp2Fw_MDN_AD03.sbin +PSP_MP2FW0_FILE TypeId0x25_Mp2Fw_MDN.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 3rdparty/blobs/mainboard/google/skyrim/TypeId0x6A_ConfigFile.sbin +PSP_MP2CFG_FILE TypeId0x6a_Mp2FwConfig_MDN.sbin