amdfwtool: Move the MP2CFG checking to category of BIOS data
Change-Id: Iaaf9c96dd0ed8c31bb50350d37646ca08a1bbff0
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47587
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c
index b3470d5..c2ce32b 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -187,13 +187,6 @@
} else {
fw_type = AMD_FW_SKIP;
}
- } else if (strcmp(fw_name, "PSP_MP2CFG_FILE") == 0) {
- if (cb_config->load_mp2_fw == 1) {
- fw_type = AMD_BIOS_MP2_CFG;
- subprog = 0;
- } else {
- fw_type = AMD_FW_SKIP;
- }
} else if (strcmp(fw_name, "PSP_DRIVERS_FILE") == 0) {
fw_type = AMD_DRIVER_ENTRIES;
subprog = 0;
@@ -267,6 +260,13 @@
fw_type = AMD_BIOS_PMUD;
subprog = 1;
instance = 4;
+ } else if (strcmp(fw_name, "PSP_MP2CFG_FILE") == 0) {
+ if (cb_config->load_mp2_fw == 1) {
+ fw_type = AMD_BIOS_MP2_CFG;
+ subprog = 0;
+ } else {
+ fw_type = AMD_FW_SKIP;
+ }
} else {
fw_type = AMD_BIOS_INVALID;
}