diff options
author | Hannah Williams <hannah.williams@intel.com> | 2017-05-05 16:30:22 -0700 |
---|---|---|
committer | Aaron Durbin <adurbin@chromium.org> | 2017-07-21 03:59:09 +0000 |
commit | 3ff14a0c8590705ba4cc184f6e9d6e5f6302fb4c (patch) | |
tree | b7e9a0d1a14365ff1cdccce168dc6c94d0e05e0d /src/soc/intel/apollolake/bootblock | |
parent | a77c68adf3a566e3eaa676d5fa4080ed41199e4b (diff) | |
download | coreboot-3ff14a0c8590705ba4cc184f6e9d6e5f6302fb4c.tar.xz |
soc/intel/apollolake: Bring in delta for GLK SOC
Change-Id: I3e76726bb77f0277ab5776ae9d3d42b7eb389fe3
Signed-off-by: Hannah Williams <hannah.williams@intel.com>
Reviewed-on: https://review.coreboot.org/19603
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/apollolake/bootblock')
-rw-r--r-- | src/soc/intel/apollolake/bootblock/bootblock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/soc/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c index 729134b933..dc81161598 100644 --- a/src/soc/intel/apollolake/bootblock/bootblock.c +++ b/src/soc/intel/apollolake/bootblock/bootblock.c @@ -33,7 +33,11 @@ #include <timestamp.h> static const struct pad_config tpm_spi_configs[] = { +#if IS_ENABLED(CONFIG_SOC_INTEL_GLK) + PAD_CFG_NF(GPIO_81, NATIVE, DEEP, NF3), /* FST_SPI_CS2_N */ +#else PAD_CFG_NF(GPIO_106, NATIVE, DEEP, NF3), /* FST_SPI_CS2_N */ +#endif }; static void tpm_enable(void) |