[coreboot-gerrit] New patch to review for coreboot: tree wide: Convert "if (CONFIG_.*_TPM.*)" to "if (IS_ENABLED(...))"

[Denis Carikli]

Denis Carikli ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13779

-gerrit

commit 6324f8788ff1b82c1227e087374e41678146fe6e
Author: Denis 'GNUtoo' Carikli 
Date:   Sat Feb 20 17:32:03 2016 +0100

tree wide: Convert "if (CONFIG_.*_TPM.*)" to "if (IS_ENABLED(...))"

Change-Id: Ib73abb0ada7dfdfab3487c005719e19f51ef1812
    Signed-off-by: Denis 'GNUtoo' Carikli 
---
 src/cpu/intel/haswell/romstage.c             | 2 +-
 src/drivers/pc80/tpm/romstage.c              | 4 ++--
 src/drivers/pc80/tpm/tpm.c                   | 2 +-
 src/northbridge/intel/sandybridge/romstage.c | 2 +-
 src/soc/intel/baytrail/romstage/romstage.c   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index 6da7fd9..9932a50 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -267,7 +267,7 @@ void romstage_common(const struct romstage_params *params)
    	printk(BIOS_DEBUG, "Romstage handoff structure not added!\n");

post_code(0x3f);
-	if (CONFIG_LPC_TPM) {
+	if (IS_ENABLED(CONFIG_LPC_TPM)) {
    	init_tpm(wake_from_s3);
    }
 }
diff --git a/src/drivers/pc80/tpm/romstage.c b/src/drivers/pc80/tpm/romstage.c
index b8b9b36..a257ba1 100644
--- a/src/drivers/pc80/tpm/romstage.c
+++ b/src/drivers/pc80/tpm/romstage.c
@@ -183,7 +183,7 @@ void init_tpm(int s3resume)
    u32 result;
    u8 response[TPM_LARGE_ENOUGH_COMMAND_SIZE];

-	if (CONFIG_TPM_DEACTIVATE) {
+	if (IS_ENABLED(CONFIG_TPM_DEACTIVATE)) {
    	printk(BIOS_SPEW, "TPM: Deactivate\n");
    	result = TlclSendReceive(tpm_deactivate_cmd.buffer,
    				response, sizeof(response));
@@ -241,7 +241,7 @@ void init_tpm(int s3resume)

printk(BIOS_ERR, "TPM: Error code 0x%x.\n", result);

-	if (CONFIG_TPM_INIT_FAILURE_IS_FATAL) {
+	if (IS_ENABLED(CONFIG_TPM_INIT_FAILURE_IS_FATAL)) {
    	printk(BIOS_ERR, "Hard reset!\n");
    	post_code(POST_TPM_FAILURE);
    	if (IS_ENABLED(CONFIG_CONSOLE_CBMEM_DUMP_TO_UART))
diff --git a/src/drivers/pc80/tpm/tpm.c b/src/drivers/pc80/tpm/tpm.c
index 064cb99..fa46b47 100644
--- a/src/drivers/pc80/tpm/tpm.c
+++ b/src/drivers/pc80/tpm/tpm.c
@@ -37,7 +37,7 @@

/* coreboot wrapper for TPM driver (start) */
 #define	TPM_DEBUG(fmt, args...)		\
-	if (CONFIG_DEBUG_TPM) {		\
+	if (IS_ENABLED(CONFIG_DEBUG_TPM)) {		\
    	printk(BIOS_DEBUG, PREFIX);		\
    	printk(BIOS_DEBUG, fmt , ##args);	\
    }
diff --git a/src/northbridge/intel/sandybridge/romstage.c b/src/northbridge/intel/sandybridge/romstage.c
index d6135bd..df0c5bb 100644
--- a/src/northbridge/intel/sandybridge/romstage.c
+++ b/src/northbridge/intel/sandybridge/romstage.c
@@ -113,7 +113,7 @@ void main(unsigned long bist)

northbridge_romstage_finalize(s3resume);

-	if (CONFIG_LPC_TPM) {
+	if (IS_ENABLED(CONFIG_LPC_TPM)) {
    	init_tpm(s3resume);
    }

diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c
index 60146b5..3668235 100644
--- a/src/soc/intel/baytrail/romstage/romstage.c
+++ b/src/soc/intel/baytrail/romstage/romstage.c
@@ -239,7 +239,7 @@ void romstage_common(struct romstage_params *params)
    else
    	printk(BIOS_DEBUG, "Romstage handoff structure not added!\n");

-	if (CONFIG_LPC_TPM) {
+	if (IS_ENABLED(CONFIG_LPC_TPM)) {
    	init_tpm(prev_sleep_state == 3);
    }
 }