GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Change-Id: Ib73abb0ada7dfdfab3487c005719e19f51ef1812
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Reviewed-on: https://review.coreboot.org/13779
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Denis 'GNUtoo' Carikli 2016-02-20 17:32:03 +01:00 committed by Stefan Reinauer
parent bfe07899e3
commit 0e92bb010f
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/intel/haswell/romstage.c
View File

@ -267,7 +267,7 @@ void romstage_common(const struct romstage_params *params)
printk(BIOS_DEBUG, "Romstage handoff structure not added!\n"); printk(BIOS_DEBUG, "Romstage handoff structure not added!\n");
post_code(0x3f); post_code(0x3f);
if (CONFIG_LPC_TPM) { if (IS_ENABLED(CONFIG_LPC_TPM)) {
init_tpm(wake_from_s3); init_tpm(wake_from_s3);
} }
} }

4
src/drivers/pc80/tpm/romstage.c
View File

@ -183,7 +183,7 @@ void init_tpm(int s3resume)
u32 result; u32 result;
u8 response[TPM_LARGE_ENOUGH_COMMAND_SIZE]; u8 response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
if (CONFIG_TPM_DEACTIVATE) { if (IS_ENABLED(CONFIG_TPM_DEACTIVATE)) {
printk(BIOS_SPEW, "TPM: Deactivate\n"); printk(BIOS_SPEW, "TPM: Deactivate\n");
result = TlclSendReceive(tpm_deactivate_cmd.buffer, result = TlclSendReceive(tpm_deactivate_cmd.buffer,
response, sizeof(response)); response, sizeof(response));
@ -241,7 +241,7 @@ void init_tpm(int s3resume)
printk(BIOS_ERR, "TPM: Error code 0x%x.\n", result); 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"); printk(BIOS_ERR, "Hard reset!\n");
post_code(POST_TPM_FAILURE); post_code(POST_TPM_FAILURE);
if (IS_ENABLED(CONFIG_CONSOLE_CBMEM_DUMP_TO_UART)) if (IS_ENABLED(CONFIG_CONSOLE_CBMEM_DUMP_TO_UART))

2
src/drivers/pc80/tpm/tpm.c
View File

@ -37,7 +37,7 @@
/* coreboot wrapper for TPM driver (start) */ /* coreboot wrapper for TPM driver (start) */
#define TPM_DEBUG(fmt, args...) \ #define TPM_DEBUG(fmt, args...) \
if (CONFIG_DEBUG_TPM) { \ if (IS_ENABLED(CONFIG_DEBUG_TPM)) { \
printk(BIOS_DEBUG, PREFIX); \ printk(BIOS_DEBUG, PREFIX); \
printk(BIOS_DEBUG, fmt , ##args); \ printk(BIOS_DEBUG, fmt , ##args); \
} }

2
src/northbridge/intel/sandybridge/romstage.c
View File

@ -113,7 +113,7 @@ void main(unsigned long bist)
northbridge_romstage_finalize(s3resume); northbridge_romstage_finalize(s3resume);
if (CONFIG_LPC_TPM) { if (IS_ENABLED(CONFIG_LPC_TPM)) {
init_tpm(s3resume); init_tpm(s3resume);
} }

2
src/soc/intel/baytrail/romstage/romstage.c
View File

@ -239,7 +239,7 @@ void romstage_common(struct romstage_params *params)
else else
printk(BIOS_DEBUG, "Romstage handoff structure not added!\n"); 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); init_tpm(prev_sleep_state == 3);
} }
} }