Martin Roth has uploaded this change for review. ( https://review.coreboot.org/21456
Change subject: soc/amd/stoney: Allow alternative placement for AMD FW directory ......................................................................
soc/amd/stoney: Allow alternative placement for AMD FW directory
Allow the AMD FW directory to be placed at one of the alternative locations within the ROM.
BUG=b:65484600 TEST=Assign PSP firmware location, build & test.
Change-Id: I9c95b9805c60ab6204750f7929049c7382e0c6cd Signed-off-by: Martin Roth martinroth@google.com --- M src/soc/amd/stoneyridge/Kconfig M src/soc/amd/stoneyridge/Makefile.inc 2 files changed, 19 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/21456/1
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index 08613fe..791cffb 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -305,4 +305,18 @@
If unsure, answer 'y'
+config AMD_FWM_POSITION + hex "Firmware Directory Table location (0x0 for auto)" + default 0x0 + help + Typically this is calculated by the ROM size, but there may + be situations where you want to put the firmware directory + table in a different location. Suggested locations are: + 512 KB - 0xFFFA0000 + 1 MB - 0xFFF20000 + 2 MB - 0xFFE20000 + 4 MB - 0xFFC20000 + 8 MB - 0xFF820000 + 16 MB - 0xFF020000 + endif # SOC_AMD_STONEYRIDGE_FP4 || SOC_AMD_STONEYRIDGE_FT4 diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index b6669f1..8b63395 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -90,7 +90,7 @@ CPPFLAGS_common += -I$(src)/soc/amd/stoneyridge/include CPPFLAGS_common += -I$(src)/soc/amd/stoneyridge/acpi
-# ROMSIG At ROMBASE + 0x20000: +# ROMSIG At ROMBASE + 0x20000 - Overridden by CONFIG_AMD_FWM_POSITION # +-----------+---------------+----------------+------------+ # |0x55AA55AA |EC ROM Address |GEC ROM Address |USB3 ROM | # +-----------+---------------+----------------+------------+ @@ -98,7 +98,11 @@ # +-----------+ # # EC ROM should be 64K aligned. +ifneq ($(CONFIG_AMD_FWM_POSITION),0x0) +STONEYRIDGE_FWM_POSITION=$(CONFIG_AMD_FWM_POSITION) +else STONEYRIDGE_FWM_POSITION=$(call int-add, $(call int-subtract, 0xffffffff $(CONFIG_ROM_SIZE)) 0x20000 1) +endif
### 0 FIRMWARE_LOCATE=$(dir $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)))