From 9eedb6d4173bdcec74333c23b43555d10ab31914 Mon Sep 17 00:00:00 2001 From: Marc Jones Date: Fri, 31 Mar 2017 15:12:24 +0800 Subject: [PATCH] UPSTREAM: 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. BUG=none BRANCH=none TEST=none Change-Id: I2d6d3cd1093c5dbe9fe57ce1ed03d30f8ef5be06 Signed-off-by: Patrick Georgi Original-Commit-Id: d81250cebc997099e022424369bcf80554ad1341 Original-Change-Id: I85963fa93d6efd707cedfbc04b92d302ad5de3b1 Original-Signed-off-by: Marc Jones Original-Reviewed-on: https://review.coreboot.org/19170 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/490078 Commit-Ready: Furquan Shaikh --- util/amdfwtool/amdfwtool.c | 4 ++-- 1 file 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 },