diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-21 20:20:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-21 20:20:00 -0400 |
| commit | 89ca873e2ddea859526f25f678fa53dda055e90f (patch) | |
| tree | 3de5d39c9e3a257d50727b50057336ca41aac2db /drivers/crypto/fsl/jr.c | |
| parent | 9f84da8de1873593d9b708aa4a8a24f46e67c744 (diff) | |
| parent | b24a4f6247d867f1301edc1c6390aca79ecbe16b (diff) | |
| download | u-boot-imx-89ca873e2ddea859526f25f678fa53dda055e90f.zip u-boot-imx-89ca873e2ddea859526f25f678fa53dda055e90f.tar.gz u-boot-imx-89ca873e2ddea859526f25f678fa53dda055e90f.tar.bz2 | |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers/crypto/fsl/jr.c')
| -rw-r--r-- | drivers/crypto/fsl/jr.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 510fa4e..4a8cc32 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -599,10 +599,27 @@ int sec_init_idx(uint8_t sec_idx) sec_out32(&sec->mcfgr, mcr); #ifdef CONFIG_FSL_CORENET +#ifdef CONFIG_SPL_BUILD + /* + * For SPL Build, Set the Liodns in SEC JR0 for + * 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; + + liodnr = sec_in32(&sec->jrliodnr[0].ls) & + ~(JRNSLIODN_MASK | JRSLIODN_MASK); + liodnr = liodnr | + (liodn_ns << JRNSLIODN_SHIFT) | + (liodn_s << JRSLIODN_SHIFT); + sec_out32(&sec->jrliodnr[0].ls, liodnr); +#else liodnr = sec_in32(&sec->jrliodnr[0].ls); liodn_ns = (liodnr & JRNSLIODN_MASK) >> JRNSLIODN_SHIFT; liodn_s = (liodnr & JRSLIODN_MASK) >> JRSLIODN_SHIFT; #endif +#endif ret = jr_init(sec_idx); if (ret < 0) { |