diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
| commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
| tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /drivers/crypto | |
| parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
| parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
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 ee822edd6c..ceb66dd627 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 3eb7be79da..4e4c4af580 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 |