diff options
| author | Franck LENORMAND <franck.lenormand@nxp.com> | 2018-08-23 09:35:23 +0200 |
|---|---|---|
| committer | Franck LENORMAND <franck.lenormand@nxp.com> | 2018-08-27 09:14:04 +0200 |
| commit | fe1cd0abc6c57cc59312ab751dd015cb149d7100 (patch) | |
| tree | 87440945f4c61a857c36d40a5e96a71390e0cec9 | |
| parent | ce68b5606a7f307e1875020dd96521b483863072 (diff) | |
MLK-18619: [MX8MM-EVK]CSU_RDC: enable csu_rdc test in ATF make the board crash
csu_rdc test in ATF makes use of GPIO 4 and 5. Unfortunatly GPIO5 is
being used by u-boot. This is why u-boot crashes.
Changing the peripherals to protect, instead of gpio4 and 5, use csu
and rdc registers instead.
Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
| -rw-r--r-- | plat/imx/common/imx8m/imx_csu.c | 8 | ||||
| -rw-r--r-- | plat/imx/common/imx8m/imx_rdc.c | 2 | ||||
| -rw-r--r-- | plat/imx/imx8mm/imx8mm_bl31_setup.c | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/plat/imx/common/imx8m/imx_csu.c b/plat/imx/common/imx8m/imx_csu.c index 85c1caf8..1bb89d71 100644 --- a/plat/imx/common/imx8m/imx_csu.c +++ b/plat/imx/common/imx8m/imx_csu.c @@ -25,11 +25,7 @@ static struct csu_slave_conf csu_def_csl_conf[] = { {CSU_CSLn_GPIO2, CSU_RW, 0}, {CSU_CSLn_GPIO3, CSU_RW, 0}, {CSU_CSLn_GPIO4, CSU_RW, 0}, -#if defined (CSU_RDC_TEST) - {CSU_CSLn_GPIO5, CSU_SSRW, 0}, -#else {CSU_CSLn_GPIO5, CSU_RW, 0}, -#endif {CSU_CSLn_Reserved1, CSU_RW, 0}, {CSU_CSLn_ANA_TSENSOR, CSU_RW, 0}, {CSU_CSLn_ANA_OSC, CSU_RW, 0}, @@ -52,7 +48,11 @@ static struct csu_slave_conf csu_def_csl_conf[] = { {CSU_CSLn_GPC, CSU_RW, 0}, {CSU_CSLn_SEMAPHORE1, CSU_RW, 0}, {CSU_CSLn_SEMAPHORE2, CSU_RW, 0}, +#if defined(CSU_RDC_TEST) + {CSU_CSLn_RDC, CSU_SSRW, 0}, +#else {CSU_CSLn_RDC, CSU_RW, 0}, +#endif {CSU_CSLn_CSU, CSU_RW, 0}, {CSU_CSLn_MST0, CSU_RW, 0}, {CSU_CSLn_MST1, CSU_RW, 0}, diff --git a/plat/imx/common/imx8m/imx_rdc.c b/plat/imx/common/imx8m/imx_rdc.c index 1929c99b..337db739 100644 --- a/plat/imx/common/imx8m/imx_rdc.c +++ b/plat/imx/common/imx8m/imx_rdc.c @@ -145,7 +145,7 @@ int imx_rdc_set_masters(struct rdc_mda_conf *masters_list, uint32_t count) #if defined (CSU_RDC_TEST) /* Default peripherals settings as an example */ static struct rdc_pdap_conf periph_config[] = { - {RDC_PDAP_GPIO4, 0x30, 0}, + {RDC_PDAP_CSU, 0x30, 0}, }; diff --git a/plat/imx/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8mm/imx8mm_bl31_setup.c index cc30c7a4..587b74dd 100644 --- a/plat/imx/imx8mm/imx8mm_bl31_setup.c +++ b/plat/imx/imx8mm/imx8mm_bl31_setup.c @@ -197,13 +197,12 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, static console_uart_t console; #endif -#if !defined (CSU_RDC_TEST) int i; /* enable CSU NS access permission */ for (i = 0; i < 64; i++) { - mmio_write_32(0x303e0000 + i * 4, 0xffffffff); + mmio_write_32(0x303e0000 + i * 4, 0x00ff00ff); } -#endif + /* config the aips access permission */ imx8mm_aips_config(); |