erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

coreboot: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX)

Browse source 
This patch is a raw application of

 find src/ -type f | xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g'

Change-Id: I6262d6d5c23cabe23c242b4f38d446b74fe16b88
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31774
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Julius Werner 2019-03-05 16:53:33 -08:00 • committed by Patrick Georgi
commit cd49cce7b7
920 changed files with 2285 additions and 2285 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/security/tpm/tspi/log.c
View file

@ -52,10 +52,10 @@ static struct tcpa_table *tcpa_log_init(void)
/* We are dealing here with pre CBMEM environment.
* If cbmem isn't available use CAR or SRAM */
if (!cbmem_possibly_online() &&
!IS_ENABLED(CONFIG_VBOOT_RETURN_FROM_VERSTAGE))
!CONFIG(VBOOT_RETURN_FROM_VERSTAGE))
return (struct tcpa_table *)_vboot2_tpm_log;
else if (ENV_ROMSTAGE &&
!IS_ENABLED(CONFIG_VBOOT_RETURN_FROM_VERSTAGE)) {
!CONFIG(VBOOT_RETURN_FROM_VERSTAGE)) {
tclt = tcpa_cbmem_init();
if (!tclt)
return (struct tcpa_table *)_vboot2_tpm_log;
@ -136,7 +136,7 @@ void tcpa_preram_log_clear(void)
tclt->num_entries = 0;
}
#if !IS_ENABLED(CONFIG_VBOOT_RETURN_FROM_VERSTAGE)
#if !CONFIG(VBOOT_RETURN_FROM_VERSTAGE)
static void recover_tcpa_log(int is_recovery)
{
struct tcpa_table *preram_log = (struct tcpa_table *)_vboot2_tpm_log;

16
src/security/tpm/tspi/tspi.c
View file

@ -22,12 +22,12 @@
#include <security/tpm/tss.h>
#include <stdlib.h>
#include <string.h>
#if IS_ENABLED(CONFIG_VBOOT)
#if CONFIG(VBOOT)
#include <vb2_api.h>
#include <assert.h>
#endif
#if IS_ENABLED(CONFIG_TPM1)
#if CONFIG(TPM1)
static uint32_t tpm1_invoke_state_machine(void)
{
uint8_t disabled;
@ -51,7 +51,7 @@ static uint32_t tpm1_invoke_state_machine(void)
}
}
if (!!deactivated != IS_ENABLED(CONFIG_TPM_DEACTIVATE)) {
if (!!deactivated != CONFIG(TPM_DEACTIVATE)) {
printk(BIOS_INFO,
"TPM: Unexpected TPM deactivated state. Toggling...\n");
result = tlcl_set_deactivated(!deactivated);
@ -167,7 +167,7 @@ uint32_t tpm_setup(int s3flag)
}
}
#if IS_ENABLED(CONFIG_TPM1)
#if CONFIG(TPM1)
result = tpm1_invoke_state_machine();
#endif
@ -185,7 +185,7 @@ uint32_t tpm_clear_and_reenable(void)
return result;
}
#if IS_ENABLED(CONFIG_TPM1)
#if CONFIG(TPM1)
result = tlcl_set_enable();
if (result != TPM_SUCCESS) {
printk(BIOS_ERR, "TPM: Can't set enabled state.\n");
@ -214,14 +214,14 @@ uint32_t tpm_extend_pcr(int pcr, enum vb2_hash_algorithm digest_algo,
if (result != TPM_SUCCESS)
return result;
if (IS_ENABLED(CONFIG_VBOOT_MEASURED_BOOT))
if (CONFIG(VBOOT_MEASURED_BOOT))
tcpa_log_add_table_entry(name, pcr, digest_algo,
digest, digest_len);
return TPM_SUCCESS;
}
#if IS_ENABLED(CONFIG_VBOOT)
#if CONFIG(VBOOT)
uint32_t tpm_measure_region(const struct region_device *rdev, uint8_t pcr,
const char *rname)
{
@ -239,7 +239,7 @@ uint32_t tpm_measure_region(const struct region_device *rdev, uint8_t pcr,
printk(BIOS_ERR, "TPM: Can't initialize library.\n");
return result;
}
if (IS_ENABLED(CONFIG_TPM1)) {
if (CONFIG(TPM1)) {
hash_alg = VB2_HASH_SHA1;
} else { /* CONFIG_TPM2 */
hash_alg = VB2_HASH_SHA256;

4
src/security/tpm/tss.h
View file

@ -19,7 +19,7 @@
#include <security/tpm/tss_errors.h>
#include <security/tpm/tss/vendor/cr50/cr50.h>
#if IS_ENABLED(CONFIG_TPM1)
#if CONFIG(TPM1)
#include <security/tpm/tss/tcg-1.2/tss_structures.h>
@ -53,7 +53,7 @@ uint32_t tlcl_get_permanent_flags(TPM_PERMANENT_FLAGS *pflags);
#endif
#if IS_ENABLED(CONFIG_TPM2)
#if CONFIG(TPM2)
#include <security/tpm/tss/tcg-2.0/tss_structures.h>