diff options
| author | Tom Rini <[email protected]> | 2025-10-10 08:23:04 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-10-10 08:23:04 -0600 |
| commit | e0516d3807dba2fba17d723b8ca815d99e161ecb (patch) | |
| tree | 0cd0683f31ceffe2e40f0ead1c55bac9ba416292 | |
| parent | 824236dd6038b14664dafe87e588311d94831f93 (diff) | |
| parent | b1ca952b488fce2ffd71d93040b1f1f2d95d4674 (diff) | |
Merge tag 'fsl-qoriq-master-2025-10-10' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq
CI: https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq/-/pipelines/27882
- crypto/rng: double the entropy delay interval for retry
- Make RAMBOOT_PBL only be valid for PowerPC or ls1021AI
| -rw-r--r-- | boot/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/crypto/fsl/jr.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index 780889023e1..eff05948b3a 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1093,6 +1093,7 @@ config SYS_RAMBOOT config RAMBOOT_PBL bool "Freescale PBL(pre-boot loader) image format support" + depends on ARCH_LS1021A || PPC select SYS_RAMBOOT if PPC help Some SoCs use PBL to load RCW and/or pre-initialization instructions. diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 8f7a821ebf3..07d336c074a 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -642,7 +642,7 @@ static int rng_init(uint8_t sec_idx, ccsr_sec_t *sec) */ if (!inst_handles) { kick_trng(ent_delay, sec); - ent_delay += 400; + ent_delay = ent_delay * 2; } /* * if instantiate_rng(...) fails, the loop will rerun |