From 35a047c4e5bce26bf355320ed61681bc07fefae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 5 Nov 2019 18:38:00 +0200 Subject: drivers/crb: Replace __RAMSTAGE_ guards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie2e6cdddc1edb95c442a4240267fe1fd6a11d37e Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/36698 Reviewed-by: Arthur Heymans Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/drivers/crb/tis.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/drivers/crb') diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c index 94bfb9ef15..b7a5df4829 100644 --- a/src/drivers/crb/tis.c +++ b/src/drivers/crb/tis.c @@ -104,8 +104,6 @@ int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, uint8_t *recvbuf, siz return 0; } -#ifdef __RAMSTAGE__ - static void crb_tpm_fill_ssdt(struct device *dev) { const char *path = acpi_device_path(dev); @@ -139,7 +137,7 @@ static const char *crb_tpm_acpi_name(const struct device *dev) return "TPM"; } -static struct device_operations crb_ops = { +static struct device_operations __unused crb_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, #if CONFIG(HAVE_ACPI_TABLES) @@ -151,9 +149,12 @@ static struct device_operations crb_ops = { static void enable_dev(struct device *dev) { +#if !DEVTREE_EARLY dev->ops = &crb_ops; +#endif } -struct chip_operations drivers_crb_ops = {CHIP_NAME("CRB TPM").enable_dev = enable_dev}; - -#endif /* __RAMSTAGE__ */ +struct chip_operations drivers_crb_ops = { + CHIP_NAME("CRB TPM") + .enable_dev = enable_dev +}; -- cgit v1.2.3