summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2019-12-12 12:38:45 -0700
committerPatrick Georgi <pgeorgi@google.com>2019-12-26 10:48:06 +0000
commitcca74861202b12033df87b72bad9e5b8b1fccf43 (patch)
treea4b9f400d9e37a96d29303a8b4c71021d5f123a2 /src/soc
parentda6170a22337af4cf227bdfb4e53fac21516d143 (diff)
downloadcoreboot-cca74861202b12033df87b72bad9e5b8b1fccf43.tar.xz
soc/amd/picasso: Configure APOB NV only with ACPI resume
The APOB NV region holds the save data for resuming. Omit it if the mainboard doesn't use HAVE_ACPI_RESUME. The APOB information will also be board-specific so remove the default values. Change-Id: I65a70bb86ad1f3c11ce37d0afa5a6fdd08bc46e2 Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37722 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/picasso/Kconfig6
-rw-r--r--src/soc/amd/picasso/Makefile.inc2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 56c7da776d..7561414c55 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -297,21 +297,15 @@ config PSP_APOB_DESTINATION
config PSP_APOB_NV_ADDRESS
hex "Base address of APOB NV"
- default 0xffa68000
help
Location in flash where the PSP can find the S3 restore information.
Place this on a boundary that the flash device can erase.
- TODO: The above default value is arbitrary, but eventually coreboot's
- MRC cache base address should be used.
config PSP_APOB_NV_SIZE
hex "Size of APOB NV to be reserved"
- default 0x10000
help
Size of the S3 restore information. Make this a multiple of the
size the flash device can erase.
- TODO: The above default value is arbitrary, but eventually coreboot's
- MRC cache size should be used.
config USE_PSPSCUREOS
bool "Include PSP SecureOS blobs in PSP build"
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 4492653713..f1e10c183f 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -207,8 +207,10 @@ PSP_BIOSBIN_DEST=$(CONFIG_ROMSTAGE_ADDR)
PSP_BIOSBIN_SIZE=$(CONFIG_RAM_RESET_VECTOR_STAGE_SIZE)
# type = 0x63
+ifeq ($(CONFIG_HAVE_ACPI_RESUME),y)
PSP_APOBNV_BASE=$(CONFIG_PSP_APOB_NV_ADDRESS)
PSP_APOBNV_SIZE=$(CONFIG_PSP_APOB_NV_SIZE)
+endif
# type2 = 0x64, 0x65
PSP_PMUI_FILE1=$(top)/$(FIRMWARE_LOCATE)/Appb_Rv_1D_Ddr4_Udimm_Imem.csbin