amdfwtool: Take a config file instead of command line parameters
To verify the consistency, see if timeless builds with and without
this patch result in identical coreboot.rom files.
BUG=b:154032833
TEST=Build & boot on mandolin
Change-Id: Icae73d0730106aab687486e555ba947796e5e757
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42859
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nikolai Vyssotski <nikolai.vyssotski@amd.corp-partner.google.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 6a5b932..7e03a41 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -446,9 +446,9 @@
comment "AMD Firmware Directory Table set to location for 16MB ROM"
depends on AMD_FWM_POSITION_INDEX = 5
-config AMD_PUBKEY_FILE
+config AMDFW_CONFIG_FILE
string
- default "3rdparty/amd_blobs/picasso/PSP/AmdPubKeyRV.bin"
+ default "src/soc/amd/picasso/fw.cfg"
config USE_PSPSECUREOS
bool
@@ -487,16 +487,6 @@
depends on HAVE_PSP_WHITELIST_FILE
default "3rdparty/amd_blobs/picasso/PSP/wtl-rvn.sbin"
-config PSP_BOOTLOADER_FILE
- string "Specify the PSP Bootloader file path"
- default "3rdparty/amd_blobs/picasso/PSP/PspBootLoader_WL_RV.sbin" if HAVE_PSP_WHITELIST_FILE
- default "3rdparty/amd_blobs/picasso/PSP/PspBootLoader_prod_RV.sbin"
- help
- Supply the name of the PSP bootloader file.
-
- Note that this option may conflict with the whitelist file if a
- different PSP bootloader binary is specified.
-
config PSP_SHAREDMEM_SIZE
hex "Maximum size of shared memory area"
default 0x3000 if VBOOT