diff options
| author | Marc Jones <marcj303@gmail.com> | 2017-03-31 15:12:24 +0800 |
|---|---|---|
| committer | Marc Jones <marc@marcjonesconsulting.com> | 2017-04-27 23:27:06 +0200 |
| commit | d81250cebc997099e022424369bcf80554ad1341 (patch) | |
| tree | 55b1b448cb880be88828ac3cde51145ddf743fb9 | |
| parent | 267e4a58245c765c7e621bfa9b6d5589effcfe01 (diff) | |
amdfwtool: Move normal firmware 2 after fanless firmware2s
Move the images around in the image stitching. This addresses
an issue found with PSP firmware loading on the Google Kahlee
mainboard.
Note firmware1 must come before firmware2 in the image or
the PSP will not allow APU to execute.
Change-Id: I85963fa93d6efd707cedfbc04b92d302ad5de3b1
Signed-off-by: Marc Jones <marcj303@gmail.com>
Reviewed-on: https://review.coreboot.org/19170
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | util/amdfwtool/amdfwtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 58d010cc5d..0c1bde5807 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -235,9 +235,9 @@ static amd_fw_entry amd_psp_fw_table[] = { { .type = AMD_FW_PSP_SECURED_DEBUG }, { .type = AMD_FW_PSP_TRUSTLETS }, { .type = AMD_FW_PSP_TRUSTLETKEY }, - { .type = AMD_FW_PSP_SMU_FIRMWARE2 }, { .type = AMD_FW_PSP_SMU_FN_FIRMWARE }, { .type = AMD_FW_PSP_SMU_FN_FIRMWARE2 }, + { .type = AMD_FW_PSP_SMU_FIRMWARE2 }, { .type = AMD_FW_PSP_SMUSCS }, { .type = AMD_PSP_FUSE_CHAIN }, { .type = AMD_FW_INVALID }, @@ -255,9 +255,9 @@ static amd_fw_entry amd_psp2_fw_table[] = { { .type = AMD_FW_PSP_SECURED_DEBUG }, { .type = AMD_FW_PSP_TRUSTLETS }, { .type = AMD_FW_PSP_TRUSTLETKEY }, - { .type = AMD_FW_PSP_SMU_FIRMWARE2 }, { .type = AMD_FW_PSP_SMU_FN_FIRMWARE }, { .type = AMD_FW_PSP_SMU_FN_FIRMWARE2 }, + { .type = AMD_FW_PSP_SMU_FIRMWARE2 }, { .type = AMD_FW_PSP_SMUSCS }, { .type = AMD_PSP_FUSE_CHAIN }, { .type = AMD_FW_INVALID }, |