diff options
| author | Tom Rini <[email protected]> | 2023-01-10 11:19:45 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-01-20 12:27:24 -0500 |
| commit | 6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd (patch) | |
| tree | ae38e9dcf468b2e4e58293561fae87895d9b549f /drivers/crypto | |
| parent | ad242344681f6a0076a6bf100aa83ac9ecbea355 (diff) | |
global: Finish CONFIG -> CFG migration
At this point, the remaining places where we have a symbol that is
defined as CONFIG_... are in fairly odd locations. While as much dead
code has been removed as possible, some of these locations are simply
less obvious at first. In other cases, this code is used, but was
defined in such a way as to have been missed by earlier checks. Perform
a rename of all such remaining symbols to be CFG_... rather than
CONFIG_...
Signed-off-by: Tom Rini <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/fsl/jr.c | 6 | ||||
| -rw-r--r-- | drivers/crypto/fsl/jr.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index ee822edd6c8..ceb66dd6270 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -328,7 +328,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) caam = &caam_st; #endif unsigned long long timeval = 0; - unsigned long long timeout = CONFIG_USEC_DEQ_TIMEOUT; + unsigned long long timeout = CFG_USEC_DEQ_TIMEOUT; struct result op; int ret = 0; @@ -743,8 +743,8 @@ int sec_init_idx(uint8_t sec_idx) * creating PAMU entries corresponding to these. * For normal build, these are set in set_liodns(). */ - liodn_ns = CONFIG_SPL_JR0_LIODN_NS & JRNSLIODN_MASK; - liodn_s = CONFIG_SPL_JR0_LIODN_S & JRSLIODN_MASK; + liodn_ns = CFG_SPL_JR0_LIODN_NS & JRNSLIODN_MASK; + liodn_s = CFG_SPL_JR0_LIODN_S & JRSLIODN_MASK; liodnr = sec_in32(&sec->jrliodnr[caam->jrid].ls) & ~(JRNSLIODN_MASK | JRSLIODN_MASK); diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h index 3eb7be79da4..4e4c4af5805 100644 --- a/drivers/crypto/fsl/jr.h +++ b/drivers/crypto/fsl/jr.h @@ -15,7 +15,7 @@ #define JR_SIZE 4 /* Timeout currently defined as 10 sec */ -#define CONFIG_USEC_DEQ_TIMEOUT 10000000U +#define CFG_USEC_DEQ_TIMEOUT 10000000U #define DEFAULT_JR_ID 0 #define DEFAULT_JR_LIODN 0 |