summaryrefslogtreecommitdiff
path: root/src/mainboard/google/skyrim
diff options
context:
space:
mode:
authorGrzegorz Bernacki <bernacki@google.com>2023-05-29 11:53:38 +0000
committerMartin L Roth <gaumless@gmail.com>2023-07-14 15:13:33 +0000
commita0bd3e9a972908c428677b2c1541d16ddf9e77a0 (patch)
tree107327f049fc4c59150c041a4ae21cb959d2730b /src/mainboard/google/skyrim
parent64335176d1445e89a9662a32222116ab19923daa (diff)
mb/google: AMD: move tpm_tis to AMD common code
It moves cr50_plat_irq_status() to common code and adds Kconfig option to specify GPIO used for interrupt. BUG=b:277787305 TEST=Build all affected platform and confirm using right GPIO number. Tested on Skyrim. Change-Id: I775c4e24cffee99b6ac3e05b58a75425029a86c8 Signed-off-by: Grzegorz Bernacki <bernacki@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/75621 Reviewed-by: Raul Rangel <rrangel@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Yu-Ping Wu <yupingso@google.com> Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com> Reviewed-by: Martin L Roth <gaumless@gmail.com>
Diffstat (limited to 'src/mainboard/google/skyrim')
-rw-r--r--src/mainboard/google/skyrim/Kconfig4
-rw-r--r--src/mainboard/google/skyrim/variants/baseboard/Makefile.inc3
-rw-r--r--src/mainboard/google/skyrim/variants/baseboard/tpm_tis.c9
3 files changed, 4 insertions, 12 deletions
diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
index 49762dcaf2..9b81502c7d 100644
--- a/src/mainboard/google/skyrim/Kconfig
+++ b/src/mainboard/google/skyrim/Kconfig
@@ -60,6 +60,10 @@ config DRIVER_TPM_I2C_ADDR
hex
default 0x50
+config GSC_IRQ_GPIO
+ int
+ default 18
+
config AMDFW_CONFIG_FILE
string
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/amdfw.cfg"
diff --git a/src/mainboard/google/skyrim/variants/baseboard/Makefile.inc b/src/mainboard/google/skyrim/variants/baseboard/Makefile.inc
index bd27f68128..7828cf1bff 100644
--- a/src/mainboard/google/skyrim/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/skyrim/variants/baseboard/Makefile.inc
@@ -1,12 +1,9 @@
bootblock-y += gpio.c
romstage-y += gpio.c
-romstage-y += tpm_tis.c
ramstage-y += gpio.c
-ramstage-y += tpm_tis.c
-verstage-y += tpm_tis.c
verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += gpio.c
smm-y += gpio.c
diff --git a/src/mainboard/google/skyrim/variants/baseboard/tpm_tis.c b/src/mainboard/google/skyrim/variants/baseboard/tpm_tis.c
deleted file mode 100644
index b3ab49aee3..0000000000
--- a/src/mainboard/google/skyrim/variants/baseboard/tpm_tis.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <drivers/tpm/cr50.h>
-#include <gpio.h>
-
-int cr50_plat_irq_status(void)
-{
- return gpio_interrupt_status(GPIO_18);
-}