summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Papageorge <matthewpapa07@gmail.com>2020-07-08 11:33:48 -0500
committerFurquan Shaikh <furquan@google.com>2020-07-30 20:55:26 +0000
commit95c42c3b04b1e499d756d979ef0ce2c428d9c540 (patch)
treec3579892a46d8fe061177c24a579dd5eb7410125
parent80e2dd88542581fe637b3ee7825bfe4c65811bba (diff)
mb/amd,google/mandolin,zork: Set EFS SPI platform config
Set platform defaults for SPI settings in Kconfig for EFS. BUG=b:158755102 TEST=Build and boot test on Tremblye and Morphius. Verify values in output image in a hex editor. Measure 1st x86 timestamp, perf improves by over a second. Change-Id: I765dada14700f4800263d2d3844af07fad0e5b71 Signed-off-by: Matt Papageorge <matthewpapa07@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/43303 Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/amd/mandolin/Kconfig14
-rw-r--r--src/mainboard/google/zork/Kconfig14
-rw-r--r--src/soc/amd/picasso/Makefile.inc7
3 files changed, 35 insertions, 0 deletions
diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index 0913c15458..03cbd4b425 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -105,4 +105,18 @@ config VGA_BIOS_DGPU_FILE
string
default "3rdparty/amd_blobs/picasso/PicassoGenericVbios.bin" if BOARD_AMD_MANDOLIN
+config EFS_SPI_READ_MODE
+ int
+ default 0 if EM100
+ default 5
+
+config EFS_SPI_SPEED
+ int
+ default 3 if EM100
+ default 0
+
+config EFS_SPI_MICRON_FLAG
+ int
+ default 0
+
endif # BOARD_AMD_MANDOLIN
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index b6ad7e0afb..6160021cba 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -226,4 +226,18 @@ config VBOOT_STARTS_IN_BOOTBLOCK
bootblock. This implies that a static VBOOT2_WORK() buffer must be
allocated in memlayout.
+config EFS_SPI_READ_MODE
+ int
+ default 4 if EM100
+ default 2
+
+config EFS_SPI_SPEED
+ int
+ default 3 if EM100
+ default 0
+
+config EFS_SPI_MICRON_FLAG
+ int
+ default 0
+
endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 4c1d726804..bbb064fa95 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -322,6 +322,9 @@ OPT_PSP_SHAREDMEM_BASE=$(call add_opt_prefix, $(PSP_SHAREDMEM_BASE), --sharedmem
OPT_PSP_SHAREDMEM_SIZE=$(call add_opt_prefix, $(PSP_SHAREDMEM_SIZE), --sharedmem-size)
OPT_APOB_NV_SIZE=$(call add_opt_prefix, $(APOB_NV_SIZE), --apob-nv-size)
OPT_APOB_NV_BASE=$(call add_opt_prefix, $(APOB_NV_BASE),--apob-nv-base)
+OPT_EFS_SPI_READ_MODE=$(call add_opt_prefix, $(CONFIG_EFS_SPI_READ_MODE), --spi-read-mode)
+OPT_EFS_SPI_SPEED=$(call add_opt_prefix, $(CONFIG_EFS_SPI_SPEED), --spi-speed)
+OPT_EFS_SPI_MICRON_FLAG=$(call add_opt_prefix, $(CONFIG_EFS_SPI_MICRON_FLAG), --spi-micron-flag)
AMDFW_COMMON_ARGS=$(OPT_AMD_PUBKEY_FILE) \
$(OPT_PSPBTLDR_FILE) \
@@ -370,6 +373,10 @@ AMDFW_COMMON_ARGS=$(OPT_AMD_PUBKEY_FILE) \
$(OPT_PSP_SHAREDMEM_SIZE) \
--combo-capable \
$(OPT_TOKEN_UNLOCK) \
+ $(OPT_EFS_SPI_READ_MODE) \
+ $(OPT_EFS_SPI_SPEED) \
+ $(OPT_EFS_SPI_MICRON_FLAG) \
+ --soc-name "Picasso" \
--flashsize $(CONFIG_ROM_SIZE)
# Copy prebuild APCBs if they exist