diff options
author | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /drivers/crypto/fsl | |
parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
download | u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.zip u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.gz u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.bz2 |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"WIP/20May2024-next
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/crypto/fsl')
-rw-r--r-- | drivers/crypto/fsl/dcp_rng.c | 1 | ||||
-rw-r--r-- | drivers/crypto/fsl/error.c | 2 | ||||
-rw-r--r-- | drivers/crypto/fsl/fsl_blob.c | 1 | ||||
-rw-r--r-- | drivers/crypto/fsl/fsl_hash.c | 1 | ||||
-rw-r--r-- | drivers/crypto/fsl/fsl_mfgprot.c | 1 | ||||
-rw-r--r-- | drivers/crypto/fsl/fsl_rsa.c | 1 | ||||
-rw-r--r-- | drivers/crypto/fsl/jobdesc.c | 2 | ||||
-rw-r--r-- | drivers/crypto/fsl/jr.c | 2 | ||||
-rw-r--r-- | drivers/crypto/fsl/rng.c | 1 | ||||
-rw-r--r-- | drivers/crypto/fsl/sec.c | 2 |
10 files changed, 4 insertions, 10 deletions
diff --git a/drivers/crypto/fsl/dcp_rng.c b/drivers/crypto/fsl/dcp_rng.c index 3170696..6b19c17 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 c765749..7b232d9 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 9b6e4bc..0ecd6be 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 f22f24b..79b32e2 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 29af79f..7c22f8e 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 335b7fe..125a72a 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 d32c1fe..5519173 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 8ae5c43..27e2480 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 0636494..786a710 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 9de30a6..e9c39dd 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 |