diff options
| author | Martin Roth <martinroth@google.com> | 2016-09-30 14:51:24 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-10-03 22:53:44 +0200 |
| commit | 6d6c00a50237dd8c9102fd24cb183ceda1aa90ac (patch) | |
| tree | bcf9e7749431f6760835d066043f35842716ea67 /src/mainboard | |
| parent | 8bc8be4d0ecd2c939a36f2846ef85d6f469180eb (diff) | |
| download | coreboot-6d6c00a50237dd8c9102fd24cb183ceda1aa90ac.tar.xz | |
google/gale: Remove #ifdef of Kconfig bool symbol
Kconfig symbols of type bool are ALWAYS defined, so this code was
always being included and run, which isn't what the author wanted.
Change to use IS_ENABLED(), and a regular if() instead of an #ifdef.
Change-Id: I72623fa27e47980c602135f4b73f371c7f50139b
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/16837
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/google/gale/verstage.c | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/src/mainboard/google/gale/verstage.c b/src/mainboard/google/gale/verstage.c index cdc4386988..1a3f5a49bd 100644 --- a/src/mainboard/google/gale/verstage.c +++ b/src/mainboard/google/gale/verstage.c @@ -24,34 +24,33 @@ static void ipq_setup_tpm(void) { -#ifdef CONFIG_I2C_TPM - gpio_tlmm_config_set(TPM_RESET_GPIO, FUNC_SEL_GPIO, - GPIO_PULL_UP, GPIO_6MA, 1); - gpio_set(TPM_RESET_GPIO, 0); - udelay(100); - gpio_set(TPM_RESET_GPIO, 1); - - /* - * ----- Per the SLB 9615XQ1.2 spec ----- - * - * 4.7.1 Reset Timing - * - * The TPM_ACCESS_x.tpmEstablishment bit has the correct value - * and the TPM_ACCESS_x.tpmRegValidSts bit is typically set - * within 8ms after RESET# is deasserted. - * - * The TPM is ready to receive a command after less than 30 ms. - * - * -------------------------------------- - * - * I'm assuming this means "wait for 30ms" - * - * If we don't wait here, subsequent QUP I2C accesses - * to the TPM either fail or timeout. - */ - mdelay(30); - -#endif /* CONFIG_I2C_TPM */ + if (IS_ENABLED(CONFIG_I2C_TPM)) { + gpio_tlmm_config_set(TPM_RESET_GPIO, FUNC_SEL_GPIO, + GPIO_PULL_UP, GPIO_6MA, 1); + gpio_set(TPM_RESET_GPIO, 0); + udelay(100); + gpio_set(TPM_RESET_GPIO, 1); + + /* + * ----- Per the SLB 9615XQ1.2 spec ----- + * + * 4.7.1 Reset Timing + * + * The TPM_ACCESS_x.tpmEstablishment bit has the correct value + * and the TPM_ACCESS_x.tpmRegValidSts bit is typically set + * within 8ms after RESET# is deasserted. + * + * The TPM is ready to receive a command after less than 30 ms. + * + * -------------------------------------- + * + * I'm assuming this means "wait for 30ms" + * + * If we don't wait here, subsequent QUP I2C accesses + * to the TPM either fail or timeout. + */ + mdelay(30); + } } void verstage_mainboard_init(void) |