GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/picasso: Add Kconfig option for the PSP bootloader filename 

Add option to change bootloader file.

BUG=b:149934526
TEST=Change option and verify new bootloader file is used. Using the
amd_blobs I can only boot using PspBootLoader_test_RV_dbg.sbin.

Change-Id: Ib6597f7d4ffa0d48aead6974bd7111c987418f20
Signed-off-by: Martin Roth <martinroth@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2067598
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41436
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Martin Roth 2020-02-20 13:54:06 -07:00 committed by Felix Held
parent 28d4275622
commit 49b09a06a9
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/soc/amd/picasso/Kconfig
View File

@ -341,10 +341,20 @@ config HAVE_PSP_WHITELIST_FILE
If unsure, answer 'n' If unsure, answer 'n'
config PSP_WHITELIST_FILE config PSP_WHITELIST_FILE
string "Debug whitelist file name" string "Debug whitelist file path"
depends on HAVE_PSP_WHITELIST_FILE depends on HAVE_PSP_WHITELIST_FILE
default "3rdparty/amd_blobs/picasso/PSP/wtl-rvn.sbin" 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_UNLOCK_SECURE_DEBUG config PSP_UNLOCK_SECURE_DEBUG
bool "Unlock secure debug" bool "Unlock secure debug"
default n default n

8
src/soc/amd/picasso/Makefile.inc
View File

@ -105,11 +105,11 @@ PICASSO_FWM_POSITION=$(call int-add, \
FIRMWARE_LOCATE=$(dir $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE))) FIRMWARE_LOCATE=$(dir $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)))
# type = 0x1 # type = 0x1
ifeq ($(CONFIG_HAVE_PSP_WHITELIST_FILE),y) ifeq ($(CONFIG_PSP_BOOTLOADER_FILE),)
PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader_WL_RV.sbin $(error CONFIG_PSP_BOOTLOADER_FILE was not defined)
else
PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader_prod_RV.sbin
endif endif
PSPBTLDR_FILE=$(realpath $(call strip_quotes, $(CONFIG_PSP_BOOTLOADER_FILE)))
$(info Adding PSP $(shell md5sum $(PSPBTLDR_FILE)))
# types = 0x8 and 0x12 # types = 0x8 and 0x12
PSP_SMUFW1_SUB1_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmwareRV2.csbin PSP_SMUFW1_SUB1_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmwareRV2.csbin