From 06b685820254a667a92633f28f8d1283775a3f1f Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Thu, 9 Jun 2022 12:45:05 -0600 Subject: [PATCH] soc/amd/sabrina: Update firmware config for soc name Modify the config file, consumed by amdfwtool, to use "sabrina" and "SBR" named files. TEST=build chausie using updated amd_blobs BUG=b:220848549 Signed-off-by: Marshall Dawson Change-Id: Ia993644e67d14792d753cc74a957529d15be18f5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/65074 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel Reviewed-by: Felix Held --- src/soc/amd/sabrina/fw.cfg | 60 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/soc/amd/sabrina/fw.cfg b/src/soc/amd/sabrina/fw.cfg index c36361509b..7b31b39222 100644 --- a/src/soc/amd/sabrina/fw.cfg +++ b/src/soc/amd/sabrina/fw.cfg @@ -2,42 +2,42 @@ # TODO: Check if this is still correct -FIRMWARE_LOCATION 3rdparty/amd_blobs/cezanne/PSP +FIRMWARE_LOCATION 3rdparty/amd_blobs/sabrina/PSP # type file # PSP -AMD_PUBKEY_FILE TypeId0x00_CezannePublicKey.tkn -PSPBTLDR_FILE TypeId0x01_PspBootLoader_CZN.sbin -PSPBTLDR_WL_FILE TypeId0x01_PspBootLoader_WL_CZN.sbin -PSPSECUREOS_FILE TypeId0x02_PspOS_CZN.sbin -PSPRCVR_FILE TypeId0x03_PspRecoveryBootLoader_CZN.sbin -PSP_SMUFW1_SUB0_FILE TypeId0x08_SmuFirmware_CZN.csbin -PSPSECUREDEBUG_FILE TypeId0x09_SecureDebugUnlockKey_CZN.stkn -PSPTRUSTLETS_FILE TypeId0x0C_FtpmDrv_CZN.csbin -PSP_SMUFW2_SUB0_FILE TypeId0x12_SmuFirmware2_CZN.csbin -PSP_SEC_DEBUG_FILE TypeId0x13_PspEarlyUnlock_CZN.sbin -PSP_HW_IPCFG_FILE TypeId0x20_HwIpCfg_CZN_A0.sbin -PSP_IKEK_FILE TypeId0x21_PspIkek_CZN.bin -PSP_SECG0_FILE TypeId0x24_SecurePolicyL0_CZN.sbin -PSP_MP2FW0_FILE TypeId0x25_Mp2Fw_CZN.sbin -AMD_DRIVER_ENTRIES TypeId0x28_PspSystemDriver_CZN.sbin +AMD_PUBKEY_FILE TypeId0x00_SabrinaPublicKey.tkn +PSPBTLDR_FILE TypeId0x01_PspBootLoader_SBR.sbin +PSPBTLDR_WL_FILE TypeId0x01_PspBootLoader_WL_SBR.sbin +PSPSECUREOS_FILE TypeId0x02_PspOS_SBR.sbin +PSPRCVR_FILE TypeId0x03_PspRecoveryBootLoader_SBR.sbin +PSP_SMUFW1_SUB0_FILE TypeId0x08_SmuFirmware_SBR.csbin +PSPSECUREDEBUG_FILE TypeId0x09_SecureDebugUnlockKey_SBR.stkn +PSPTRUSTLETS_FILE TypeId0x0C_FtpmDrv_SBR.csbin +PSP_SMUFW2_SUB0_FILE TypeId0x12_SmuFirmware2_SBR.csbin +PSP_SEC_DEBUG_FILE TypeId0x13_PspEarlyUnlock_SBR.sbin +PSP_HW_IPCFG_FILE TypeId0x20_HwIpCfg_SBR_A0.sbin +PSP_IKEK_FILE TypeId0x21_PspIkek_SBR.bin +PSP_SECG0_FILE TypeId0x24_SecurePolicyL0_SBR.sbin +PSP_MP2FW0_FILE TypeId0x25_Mp2Fw_SBR.sbin +AMD_DRIVER_ENTRIES TypeId0x28_PspSystemDriver_SBR.sbin PSP_KVM_ENGINE_DUMMY_FILE TypeId0x29_KvmEngineDummy.csbin -PSP_S0I3_FILE TypeId0x2D_AgesaRunTimeDrv_CZN.sbin -PSP_ABL0_FILE TypeId0x30_AgesaBootloaderU_CZN_LPDDR4.csbin -VBIOS_BTLOADER_FILE TypeId0x3C_VbiosBootLoader_CZN.sbin -SECURE_POLICY_L1_FILE TypeId0x45_SecurePolicyL1_CZN.sbin -UNIFIEDUSB_FILE TypeId0x44_UnifiedUsb_CZN.sbin -DRTMTA_FILE TypeId0x47_DrtmTA_CZN.sbin -KEYDBBL_FILE TypeId0x50_KeyDbBl_CZN.sbin -KEYDB_TOS_FILE TypeId0x51_KeyDbTos_CZN.sbin -SPL_TABLE_FILE TypeId0x55_SplTableBl_CZN.sbin +PSP_S0I3_FILE TypeId0x2D_AgesaRunTimeDrv_SBR.sbin +PSP_ABL0_FILE TypeId0x30_AgesaBootloaderU_SBR_LPDDR4.csbin +VBIOS_BTLOADER_FILE TypeId0x3C_VbiosBootLoader_SBR.sbin +SECURE_POLICY_L1_FILE TypeId0x45_SecurePolicyL1_SBR.sbin +UNIFIEDUSB_FILE TypeId0x44_UnifiedUsb_SBR.sbin +DRTMTA_FILE TypeId0x47_DrtmTA_SBR.sbin +KEYDBBL_FILE TypeId0x50_KeyDbBl_SBR.sbin +KEYDB_TOS_FILE TypeId0x51_KeyDbTos_SBR.sbin +SPL_TABLE_FILE TypeId0x55_SplTableBl_SBR.sbin DMCUERAMDCN21_FILE TypeId0x58_DmcuEramDcn21.sbin DMCUINTVECTORSDCN21_FILE TypeId0x59_DmcuIntvectorsDcn21.sbin -PSPBTLDR_AB_FILE TypeId0x73_PspBootLoader_AB_CZN.sbin +PSPBTLDR_AB_FILE TypeId0x73_PspBootLoader_AB_SBR.sbin # BDT -PSP_PMUI_FILE_SUB0_INS1 TypeId0x64_Appb_CZN_1D_Lpddr4_Imem.csbin -PSP_PMUD_FILE_SUB0_INS1 TypeId0x65_Appb_CZN_1D_Lpddr4_Dmem.csbin -PSP_PMUI_FILE_SUB0_INS2 TypeId0x64_Appb_CZN_2D_Lpddr4_Imem.csbin -PSP_PMUD_FILE_SUB0_INS2 TypeId0x65_Appb_CZN_2D_Lpddr4_Dmem.csbin +PSP_PMUI_FILE_SUB0_INS1 TypeId0x64_Appb_SBR_1D_Lpddr4_Imem.csbin +PSP_PMUD_FILE_SUB0_INS1 TypeId0x65_Appb_SBR_1D_Lpddr4_Dmem.csbin +PSP_PMUI_FILE_SUB0_INS2 TypeId0x64_Appb_SBR_2D_Lpddr4_Imem.csbin +PSP_PMUD_FILE_SUB0_INS2 TypeId0x65_Appb_SBR_2D_Lpddr4_Dmem.csbin PSP_MP2CFG_FILE MP2FWConfig.sbin