summaryrefslogtreecommitdiff
path: root/util/amdfwtool
diff options
context:
space:
mode:
authorZheng Bao <fishbaozi@gmail.com>2020-11-14 21:54:06 +0800
committerPatrick Georgi <pgeorgi@google.com>2020-11-17 08:07:12 +0000
commit5014373edd89835609101821befc6d89dcaadb10 (patch)
tree3df0d0999be81c956e5b99685d74b873ff3ba746 /util/amdfwtool
parent123a37ed3607a042e77405b5e2235880e223201c (diff)
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>
Diffstat (limited to 'util/amdfwtool')
-rw-r--r--util/amdfwtool/data_parse.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c
index b3470d54cc..c2ce32befb 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -187,13 +187,6 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename,
} 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 @@ static uint8_t find_register_fw_filename_bios_dir(char *fw_name, char *filename,
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;
}