commit baa16e9c254b10b0a7963f197beabba5b544d41c
author Kyösti Mälkki <kyosti.malkki@gmail.com> Tue Nov 05 18:38:00 2019 +0200
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Thu Nov 21 19:38:17 2019 +0000
tree 85f8ffef779a7be8d40509e0a8d719e04c067a4d
parent 7715c0dea7b4aa2b9f69923080958a93bfe4ddae

drivers/pc80/tpm: Replace __RAMSTAGE_ guards

Change-Id: Ia6e161c3b4fc44292cdac692a2918c522680d60d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36631
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/drivers/pc80/tpm/tis.c

diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index 5927377..1baab26 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -721,8 +721,6 @@
 	return tis_readresponse(recvbuf, recv_len);
 }
 
-#ifdef __RAMSTAGE__
-
 /*
  * tis_setup_interrupt()
  *
@@ -769,7 +767,7 @@
 static void lpc_tpm_set_resources(struct device *dev)
 {
 	tpm_config_t *config = (tpm_config_t *)dev->chip_info;
-	struct resource *res;
+	DEVTREE_CONST struct resource *res;
 
 	for (res = dev->resource_list; res; res = res->next) {
 		if (!(res->flags & IORESOURCE_ASSIGNED))
@@ -783,8 +781,10 @@
 			continue;
 		}
 
+#if !DEVTREE_EARLY
 		res->flags |= IORESOURCE_STORED;
 		report_resource_stored(dev, res, " <tpm>");
+#endif
 	}
 }
 
@@ -973,8 +973,10 @@
 	acpigen_pop_len(); /* Device */
 	acpigen_pop_len(); /* Scope */
 
+#if !DEVTREE_EARLY
 	printk(BIOS_INFO, "%s.%s: %s %s\n", path, acpi_device_name(dev),
 	       dev->chip_ops->name, dev_path(dev));
+#endif
 }
 
 static const char *lpc_tpm_acpi_name(const struct device *dev)
@@ -1006,5 +1008,3 @@
 	CHIP_NAME("LPC TPM")
 	.enable_dev = enable_dev
 };
-
-#endif /* __RAMSTAGE__ */