[PATCH 71/81] tpm: Remove <common.h> and add needed includes
Ilias Apalodimas
ilias.apalodimas at linaro.org
Tue May 7 09:36:46 CEST 2024
On Thu, 2 May 2024 at 04:34, Tom Rini <trini at konsulko.com> wrote:
>
> Remove <common.h> from this driver directory and when needed
> add missing include files directly.
>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
> Cc: Ilias Apalodimas <ilias.apalodimas at linaro.org>
> Cc: Tom Rini <trini at konsulko.com>
> Cc: Simon Glass <sjg at chromium.org>
> ---
> drivers/tpm/cr50_i2c.c | 2 +-
> drivers/tpm/sandbox_common.c | 1 -
> drivers/tpm/tpm-uclass.c | 2 +-
> drivers/tpm/tpm2_ftpm_tee.c | 1 -
> drivers/tpm/tpm2_tis_core.c | 2 +-
> drivers/tpm/tpm2_tis_i2c.c | 1 -
> drivers/tpm/tpm2_tis_mmio.c | 1 -
> drivers/tpm/tpm2_tis_sandbox.c | 1 -
> drivers/tpm/tpm2_tis_spi.c | 2 +-
> drivers/tpm/tpm_atmel_twi.c | 2 +-
> drivers/tpm/tpm_tis_infineon.c | 2 +-
> drivers/tpm/tpm_tis_lpc.c | 1 -
> drivers/tpm/tpm_tis_sandbox.c | 1 -
> drivers/tpm/tpm_tis_st33zp24_i2c.c | 1 -
> drivers/tpm/tpm_tis_st33zp24_spi.c | 1 -
> 15 files changed, 6 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
> index acf4c7859a9f..08ec179346e2 100644
> --- a/drivers/tpm/cr50_i2c.c
> +++ b/drivers/tpm/cr50_i2c.c
> @@ -7,12 +7,12 @@
>
> #define LOG_CATEGORY UCLASS_TPM
>
> -#include <common.h>
> #include <dm.h>
> #include <i2c.h>
> #include <irq.h>
> #include <log.h>
> #include <spl.h>
> +#include <time.h>
> #include <tpm-common.h>
> #include <tpm-v2.h>
> #include <acpi/acpigen.h>
> diff --git a/drivers/tpm/sandbox_common.c b/drivers/tpm/sandbox_common.c
> index 7e0b2502e35d..596e01563899 100644
> --- a/drivers/tpm/sandbox_common.c
> +++ b/drivers/tpm/sandbox_common.c
> @@ -7,7 +7,6 @@
>
> #define LOG_CATEGORY UCLASS_TPM
>
> -#include <common.h>
> #include <tpm-v1.h>
> #include <tpm-v2.h>
> #include <asm/unaligned.h>
> diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
> index b2286f7e7edc..0fade2dcc0ad 100644
> --- a/drivers/tpm/tpm-uclass.c
> +++ b/drivers/tpm/tpm-uclass.c
> @@ -6,9 +6,9 @@
>
> #define LOG_CATEGORY UCLASS_TPM
>
> -#include <common.h>
> #include <dm.h>
> #include <log.h>
> +#include <time.h>
> #include <tpm_api.h>
> #include <tpm-v1.h>
> #include <tpm-v2.h>
> diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
> index c61ff2c2af63..f2ced50c4eb7 100644
> --- a/drivers/tpm/tpm2_ftpm_tee.c
> +++ b/drivers/tpm/tpm2_ftpm_tee.c
> @@ -13,7 +13,6 @@
> * https://github.com/microsoft/ms-tpm-20-ref/tree/master/Samples/ARM32-FirmwareTPM/optee_ta/fTPM
> */
>
> -#include <common.h>
> #include <dm.h>
> #include <log.h>
> #include <tpm-v2.h>
> diff --git a/drivers/tpm/tpm2_tis_core.c b/drivers/tpm/tpm2_tis_core.c
> index 81b9210056db..680a6409433e 100644
> --- a/drivers/tpm/tpm2_tis_core.c
> +++ b/drivers/tpm/tpm2_tis_core.c
> @@ -5,8 +5,8 @@
> * Based on the Linux TIS core interface and U-Boot original SPI TPM driver
> */
>
> -#include <common.h>
> #include <dm.h>
> +#include <time.h>
> #include <tpm-v2.h>
> #include <linux/delay.h>
> #include <linux/unaligned/be_byteshift.h>
> diff --git a/drivers/tpm/tpm2_tis_i2c.c b/drivers/tpm/tpm2_tis_i2c.c
> index 99d1cf218daf..93efccc77575 100644
> --- a/drivers/tpm/tpm2_tis_i2c.c
> +++ b/drivers/tpm/tpm2_tis_i2c.c
> @@ -3,7 +3,6 @@
> * Copyright 2022 IBM Corp.
> */
>
> -#include <common.h>
> #include <dm.h>
> #include <fdtdec.h>
> #include <i2c.h>
> diff --git a/drivers/tpm/tpm2_tis_mmio.c b/drivers/tpm/tpm2_tis_mmio.c
> index a646ce41ff4e..dee5503c055f 100644
> --- a/drivers/tpm/tpm2_tis_mmio.c
> +++ b/drivers/tpm/tpm2_tis_mmio.c
> @@ -5,7 +5,6 @@
> * Specifications at www.trustedcomputinggroup.org
> */
>
> -#include <common.h>
> #include <dm.h>
> #include <log.h>
> #include <tpm-v2.h>
> diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
> index d15a28d9fc82..50e308e71161 100644
> --- a/drivers/tpm/tpm2_tis_sandbox.c
> +++ b/drivers/tpm/tpm2_tis_sandbox.c
> @@ -4,7 +4,6 @@
> * Author: Miquel Raynal <miquel.raynal at bootlin.com>
> */
>
> -#include <common.h>
> #include <dm.h>
> #include <tpm-v2.h>
> #include <asm/state.h>
> diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
> index de9cf8f21e07..28079b5039a3 100644
> --- a/drivers/tpm/tpm2_tis_spi.c
> +++ b/drivers/tpm/tpm2_tis_spi.c
> @@ -13,11 +13,11 @@
> * It is based on the U-Boot driver tpm_tis_infineon_i2c.c.
> */
>
> -#include <common.h>
> #include <dm.h>
> #include <fdtdec.h>
> #include <log.h>
> #include <spi.h>
> +#include <time.h>
> #include <tpm-v2.h>
> #include <linux/bitops.h>
> #include <linux/delay.h>
> diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
> index fd2a45d34b03..05dd66525c77 100644
> --- a/drivers/tpm/tpm_atmel_twi.c
> +++ b/drivers/tpm/tpm_atmel_twi.c
> @@ -5,11 +5,11 @@
> * Written by Dirk Eibach <dirk.eibach at gdsys.cc>
> */
>
> -#include <common.h>
> #include <display_options.h>
> #include <dm.h>
> #include <tpm-v1.h>
> #include <i2c.h>
> +#include <time.h>
> #include <asm/unaligned.h>
> #include <linux/delay.h>
>
> diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
> index 16f4af0e331e..e2f6238cbc71 100644
> --- a/drivers/tpm/tpm_tis_infineon.c
> +++ b/drivers/tpm/tpm_tis_infineon.c
> @@ -19,11 +19,11 @@
> * Version: 2.1.1
> */
>
> -#include <common.h>
> #include <dm.h>
> #include <fdtdec.h>
> #include <i2c.h>
> #include <log.h>
> +#include <time.h>
> #include <tpm-v1.h>
> #include <linux/delay.h>
> #include <linux/errno.h>
> diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
> index 13a133d58ebd..dec7acb0c7b1 100644
> --- a/drivers/tpm/tpm_tis_lpc.c
> +++ b/drivers/tpm/tpm_tis_lpc.c
> @@ -12,7 +12,6 @@
> * slb9635), so this driver provides access to locality 0 only.
> */
>
> -#include <common.h>
> #include <dm.h>
> #include <log.h>
> #include <mapmem.h>
> diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
> index 7350e1c4d525..2bc7dc87ed30 100644
> --- a/drivers/tpm/tpm_tis_sandbox.c
> +++ b/drivers/tpm/tpm_tis_sandbox.c
> @@ -3,7 +3,6 @@
> * Copyright (c) 2013 Google, Inc
> */
>
> -#include <common.h>
> #include <display_options.h>
> #include <dm.h>
> #include <tpm-v1.h>
> diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
> index e0eeabb93371..1a265b28b22f 100644
> --- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
> +++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
> @@ -12,7 +12,6 @@
> * STMicroelectronics Protocol Stack Specification version 1.2.0.
> */
>
> -#include <common.h>
> #include <dm.h>
> #include <fdtdec.h>
> #include <i2c.h>
> diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
> index f0de8a65b093..2cf690328d87 100644
> --- a/drivers/tpm/tpm_tis_st33zp24_spi.c
> +++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
> @@ -12,7 +12,6 @@
> * STMicroelectronics Protocol Stack Specification version 1.2.0.
> */
>
> -#include <common.h>
> #include <dm.h>
> #include <fdtdec.h>
> #include <log.h>
> --
> 2.34.1
>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>
More information about the U-Boot
mailing list