Change in coreboot[master]: drivers/pc80/tpm: Remove support code if TPM is disabled

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41873 )

Change subject: drivers/pc80/tpm: Remove support code if TPM is disabled
......................................................................

drivers/pc80/tpm: Remove support code if TPM is disabled

Change-Id: I7015d4bf6f536c5cea8e1174db81f09f756ae0e5
Signed-off-by: Kyösti Mälkki 
---
M src/drivers/pc80/tpm/tis.c
1 file changed, 3 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/41873/1

diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index 185df34..4cc6823 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -993,8 +993,9 @@

static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &lpc_tpm_ops,
-			   ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
+	if (CONFIG(TPM1) || CONFIG(TPM2))
+		pnp_enable_devices(dev, &lpc_tpm_ops,
+			ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

struct chip_operations drivers_pc80_tpm_ops = {

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41873 )

Change subject: drivers/pc80/tpm: Remove support code if TPM is disabled
......................................................................

Patch Set 1: Code-Review+1

[Kyösti Mälkki (Code Review)]

Hello build bot (Jenkins), Christian Walter, Michael Niewöhner,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/41873

to look at the new patch set (#3).

Change subject: drivers/pc80/tpm: Remove support code if TPM is disabled
......................................................................

drivers/pc80/tpm: Remove support code if TPM is disabled

Change-Id: I7015d4bf6f536c5cea8e1174db81f09f756ae0e5
Signed-off-by: Kyösti Mälkki 
---
M src/drivers/pc80/tpm/tis.c
1 file changed, 3 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/41873/3

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41873 )

Change subject: drivers/pc80/tpm: Remove support code if TPM is disabled
......................................................................

Patch Set 3: Code-Review+1

[Christian Walter (Code Review)]

Christian Walter has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41873 )

Change subject: drivers/pc80/tpm: Remove support code if TPM is disabled
......................................................................

Patch Set 3: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41873 )

Change subject: drivers/pc80/tpm: Remove support code if TPM is disabled
......................................................................

drivers/pc80/tpm: Remove support code if TPM is disabled

Change-Id: I7015d4bf6f536c5cea8e1174db81f09f756ae0e5
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41873
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Christian Walter 
Reviewed-by: Michael Niewöhner
---
M src/drivers/pc80/tpm/tis.c
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, but someone else must approve
  Christian Walter: Looks good to me, approved
  Michael Niewöhner: Looks good to me, but someone else must approve

diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index 4fbb09e..27d238c 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -993,8 +993,9 @@

static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &lpc_tpm_ops,
-			   ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
+	if (CONFIG(TPM1) || CONFIG(TPM2))
+		pnp_enable_devices(dev, &lpc_tpm_ops,
+			ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }

struct chip_operations drivers_pc80_tpm_ops = {