[PATCH 22/81] crypto: Remove <common.h> and add needed includes

Remove <common.h> from this driver directory and when needed add missing include files directly.

Signed-off-by: Tom Rini trini@konsulko.com --- Cc: Tom Rini trini@konsulko.com Cc: Ryan Chen ryan_chen@aspeedtech.com Cc: Chia-Wei Wang chiawei_wang@aspeedtech.com Cc: Aspeed BMC SW team BMC-SW@aspeedtech.com Cc: Joel Stanley joel@jms.id.au Cc: Gaurav Jain gaurav.jain@nxp.com Cc: Marek Vasut marek.vasut+renesas@mailbox.org --- drivers/crypto/ace_sha.c | 4 +++- drivers/crypto/ace_sha.h | 2 ++ drivers/crypto/aspeed/aspeed_acry.c | 1 - drivers/crypto/aspeed/aspeed_hace.c | 1 - drivers/crypto/fsl/dcp_rng.c | 1 - drivers/crypto/fsl/error.c | 2 +- drivers/crypto/fsl/fsl_blob.c | 1 - drivers/crypto/fsl/fsl_hash.c | 1 - drivers/crypto/fsl/fsl_mfgprot.c | 1 - drivers/crypto/fsl/fsl_rsa.c | 1 - drivers/crypto/fsl/jobdesc.c | 2 +- drivers/crypto/fsl/jr.c | 2 +- drivers/crypto/fsl/rng.c | 1 - drivers/crypto/fsl/sec.c | 2 +- drivers/crypto/hash/hash-uclass.c | 1 - drivers/crypto/hash/hash_sw.c | 1 - drivers/crypto/nuvoton/npcm_aes.c | 2 +- drivers/crypto/nuvoton/npcm_sha.c | 1 - drivers/crypto/rsa_mod_exp/mod_exp_sw.c | 1 - drivers/crypto/rsa_mod_exp/mod_exp_uclass.c | 1 - 20 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/drivers/crypto/ace_sha.c b/drivers/crypto/ace_sha.c index 261d3efe84e5..0e43e82fc5fa 100644 --- a/drivers/crypto/ace_sha.c +++ b/drivers/crypto/ace_sha.c @@ -3,10 +3,12 @@ * Advanced Crypto Engine - SHA Firmware * Copyright (c) 2012 Samsung Electronics */ -#include <common.h> + +#include <config.h> #include "ace_sha.h" #include <log.h> #include <rand.h> +#include <linux/string.h>

#ifdef CONFIG_SHA_HW_ACCEL #include <u-boot/sha256.h> diff --git a/drivers/crypto/ace_sha.h b/drivers/crypto/ace_sha.h index ad9e81a586c7..efc791a4def4 100644 --- a/drivers/crypto/ace_sha.h +++ b/drivers/crypto/ace_sha.h @@ -8,6 +8,8 @@ #ifndef __ACE_SHA_H #define __ACE_SHA_H

+#include <linux/types.h> + struct exynos_ace_sfr { unsigned int fc_intstat; /* base + 0 */ unsigned int fc_intenset; diff --git a/drivers/crypto/aspeed/aspeed_acry.c b/drivers/crypto/aspeed/aspeed_acry.c index 47a007f633a6..e3f81ebd5c74 100644 --- a/drivers/crypto/aspeed/aspeed_acry.c +++ b/drivers/crypto/aspeed/aspeed_acry.c @@ -3,7 +3,6 @@ * Copyright 2021 ASPEED Technology Inc. */ #include <config.h> -#include <common.h> #include <clk.h> #include <dm.h> #include <asm/types.h> diff --git a/drivers/crypto/aspeed/aspeed_hace.c b/drivers/crypto/aspeed/aspeed_hace.c index 6b6c8fa65889..17cc30a7b54d 100644 --- a/drivers/crypto/aspeed/aspeed_hace.c +++ b/drivers/crypto/aspeed/aspeed_hace.c @@ -3,7 +3,6 @@ * Copyright 2021 ASPEED Technology Inc. */ #include <config.h> -#include <common.h> #include <dm.h> #include <clk.h> #include <log.h> diff --git a/drivers/crypto/fsl/dcp_rng.c b/drivers/crypto/fsl/dcp_rng.c index 31706960157c..6b19c171fcda 100644 --- a/drivers/crypto/fsl/dcp_rng.c +++ b/drivers/crypto/fsl/dcp_rng.c @@ -7,7 +7,6 @@ * Based on RNGC driver in drivers/char/hw_random/imx-rngc.c in Linux */

-#include <common.h> #include <cpu_func.h> #include <dm.h> #include <rng.h> diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c index c76574919c74..7b232d94c2a3 100644 --- a/drivers/crypto/fsl/error.c +++ b/drivers/crypto/fsl/error.c @@ -7,9 +7,9 @@ * Derived from error.c file in linux drivers/crypto/caam */

-#include <common.h> #include <log.h> #include <malloc.h> +#include <vsprintf.h> #include "desc.h" #include "jr.h"

diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c index 9b6e4bca062c..0ecd6befd259 100644 --- a/drivers/crypto/fsl/fsl_blob.c +++ b/drivers/crypto/fsl/fsl_blob.c @@ -4,7 +4,6 @@ * */

-#include <common.h> #include <cpu_func.h> #include <log.h> #include <malloc.h> diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c index f22f24b60775..79b32e2627c4 100644 --- a/drivers/crypto/fsl/fsl_hash.c +++ b/drivers/crypto/fsl/fsl_hash.c @@ -4,7 +4,6 @@ * Copyright 2021 NXP */

-#include <common.h> #include <cpu_func.h> #include <log.h> #include <malloc.h> diff --git a/drivers/crypto/fsl/fsl_mfgprot.c b/drivers/crypto/fsl/fsl_mfgprot.c index 29af79f577dc..7c22f8e012b8 100644 --- a/drivers/crypto/fsl/fsl_mfgprot.c +++ b/drivers/crypto/fsl/fsl_mfgprot.c @@ -4,7 +4,6 @@ * Copyright 2017 NXP */

-#include <common.h> #include <errno.h> #include <fsl_sec.h> #include <memalign.h> diff --git a/drivers/crypto/fsl/fsl_rsa.c b/drivers/crypto/fsl/fsl_rsa.c index 335b7fe25acb..125a72ae6d32 100644 --- a/drivers/crypto/fsl/fsl_rsa.c +++ b/drivers/crypto/fsl/fsl_rsa.c @@ -5,7 +5,6 @@ */

#include <config.h> -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <log.h> diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c index d32c1fe5c31a..551917369318 100644 --- a/drivers/crypto/fsl/jobdesc.c +++ b/drivers/crypto/fsl/jobdesc.c @@ -8,7 +8,7 @@ * */

-#include <common.h> +#include <config.h> #include <cpu_func.h> #include <fsl_sec.h> #include "desc_constr.h" diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 203f16252159..4436e23b72ac 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -6,7 +6,7 @@ * Based on CAAM driver in drivers/crypto/caam in Linux */

-#include <common.h> +#include <config.h> #include <cpu_func.h> #include <linux/kernel.h> #include <log.h> diff --git a/drivers/crypto/fsl/rng.c b/drivers/crypto/fsl/rng.c index 063649480521..786a710f5fb6 100644 --- a/drivers/crypto/fsl/rng.c +++ b/drivers/crypto/fsl/rng.c @@ -7,7 +7,6 @@ */

#include <asm/cache.h> -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <rng.h> diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c index 9de30a6112fa..e9c39ddcfd9e 100644 --- a/drivers/crypto/fsl/sec.c +++ b/drivers/crypto/fsl/sec.c @@ -3,7 +3,7 @@ * Copyright 2014 Freescale Semiconductor, Inc. */

-#include <common.h> +#include <config.h> #include <linux/libfdt.h> #include <fdt_support.h> #if CONFIG_SYS_FSL_SEC_COMPAT == 2 || CONFIG_SYS_FSL_SEC_COMPAT >= 4 diff --git a/drivers/crypto/hash/hash-uclass.c b/drivers/crypto/hash/hash-uclass.c index 446eb9e56a4f..5d9f1e0d59bd 100644 --- a/drivers/crypto/hash/hash-uclass.c +++ b/drivers/crypto/hash/hash-uclass.c @@ -6,7 +6,6 @@

#define LOG_CATEGORY UCLASS_HASH

-#include <common.h> #include <dm.h> #include <asm/global_data.h> #include <u-boot/hash.h> diff --git a/drivers/crypto/hash/hash_sw.c b/drivers/crypto/hash/hash_sw.c index d8065d68ea48..ffd4ab149ffb 100644 --- a/drivers/crypto/hash/hash_sw.c +++ b/drivers/crypto/hash/hash_sw.c @@ -4,7 +4,6 @@ * Author: ChiaWei Wang chiawei_wang@aspeedtech.com */ #include <config.h> -#include <common.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/drivers/crypto/nuvoton/npcm_aes.c b/drivers/crypto/nuvoton/npcm_aes.c index 6493ea108ec7..8d3a30ea918d 100644 --- a/drivers/crypto/nuvoton/npcm_aes.c +++ b/drivers/crypto/nuvoton/npcm_aes.c @@ -3,13 +3,13 @@ * Copyright (c) 2021 Nuvoton Technology Corp. */

-#include <common.h> #include <dm.h> #include <uboot_aes.h> #include <asm/io.h> #include <asm/arch/aes.h> #include <asm/arch/otp.h> #include <malloc.h> +#include <time.h>

#define ONE_SECOND 0xC00000

diff --git a/drivers/crypto/nuvoton/npcm_sha.c b/drivers/crypto/nuvoton/npcm_sha.c index 7ebdfa16f4fc..f06be86ca59e 100644 --- a/drivers/crypto/nuvoton/npcm_sha.c +++ b/drivers/crypto/nuvoton/npcm_sha.c @@ -3,7 +3,6 @@ * Copyright (c) 2022 Nuvoton Technology Corp. */

-#include <common.h> #include <dm.h> #include <hash.h> #include <malloc.h> diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_sw.c b/drivers/crypto/rsa_mod_exp/mod_exp_sw.c index 7bed444c3fbf..4f59adc09c9c 100644 --- a/drivers/crypto/rsa_mod_exp/mod_exp_sw.c +++ b/drivers/crypto/rsa_mod_exp/mod_exp_sw.c @@ -5,7 +5,6 @@ */

#include <config.h> -#include <common.h> #include <dm.h> #include <log.h> #include <u-boot/rsa-mod-exp.h> diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c index 057cc74b10bb..107500dd6e07 100644 --- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c +++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c @@ -6,7 +6,6 @@

#define LOG_CATEGORY UCLASS_MOD_EXP

-#include <common.h> #include <dm.h> #include <asm/global_data.h> #include <u-boot/rsa-mod-exp.h>