From 6b52f82df270bfce1ac99249f8fb8f7bdf11c597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Fri, 5 Dec 2025 11:03:57 +0100 Subject: [PATCH] util/amdfwtool: Remove AMD_FW_GFXIMU_2 entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AMD_FW_GFXIMU_2 entry has the same type value as AMD_FW_SRAM_FW_EXT. The tool may integrate one of these blobs incorrectly, because it searches for the first entry of given type in the amd_psp_fw_table. AMD_FW_GFXIMU_2 could have been added by mistake, because there is no board that actually defines PSP_GFX_IMMU_FILE_2 in fw.cfg file. Change-Id: I7e1f38c77156d06e9e6d801bdfa9b9eefcbb374e Signed-off-by: Michał Żygowski Reviewed-on: https://review.coreboot.org/c/coreboot/+/90388 Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- util/amdfwtool/amdfwtool.c | 1 - util/amdfwtool/amdfwtool.h | 1 - util/amdfwtool/data_parse.c | 4 ---- 3 files changed, 6 deletions(-) diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index bac1c5bdbf..4184a60b74 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -266,7 +266,6 @@ amd_fw_entry amd_psp_fw_table[] = { { .type = AMD_FW_GFXIMU_0, .subprog = 1, .level = PSP_BOTH | PSP_LVL2_AB }, { .type = AMD_FW_GFXIMU_1, .subprog = 0, .level = PSP_BOTH | PSP_LVL2_AB }, { .type = AMD_FW_GFXIMU_1, .subprog = 1, .level = PSP_BOTH | PSP_LVL2_AB }, - { .type = AMD_FW_GFXIMU_2, .level = PSP_BOTH | PSP_LVL2_AB }, { .type = AMD_FW_SRAM_FW_EXT, .level = PSP_LVL2 | PSP_LVL2_AB }, { .type = AMD_FW_UMSMU, .level = PSP_LVL2 | PSP_LVL2_AB }, { .type = AMD_FW_S3IMG, .level = PSP_LVL2 | PSP_LVL2_AB }, diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h index dbc1c4adc0..fe3f72b85d 100644 --- a/util/amdfwtool/amdfwtool.h +++ b/util/amdfwtool/amdfwtool.h @@ -118,7 +118,6 @@ typedef enum _amd_fw_type { AMD_FW_MINIMSMU = 0x9a, AMD_FW_GFXIMU_0 = 0x9b, AMD_FW_GFXIMU_1 = 0x9c, - AMD_FW_GFXIMU_2 = 0x9d, AMD_FW_SRAM_FW_EXT = 0x9d, AMD_FW_UMSMU = 0xa2, AMD_FW_S3IMG = 0xa0, diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c index 13922d63c9..2ea37efd67 100644 --- a/util/amdfwtool/data_parse.c +++ b/util/amdfwtool/data_parse.c @@ -407,10 +407,6 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename, fw_type = AMD_FW_GFXIMU_1; instance = 0; subprog = 1; - } else if (strcmp(fw_name, "PSP_GFX_IMMU_FILE_2") == 0) { - fw_type = AMD_FW_GFXIMU_2; - instance = 0; - subprog = 0; } else if (strcmp(fw_name, "MINIMSMU_FILE_INS1") == 0) { fw_type = AMD_FW_MINIMSMU; instance = 1;