diff options
| author | Jacky Bai <ping.bai@nxp.com> | 2020-02-13 11:27:34 +0800 |
|---|---|---|
| committer | Jacky Bai <ping.bai@nxp.com> | 2020-03-03 14:33:52 +0800 |
| commit | ba12300cbf45b4d6a9acd484f4c1b80bef72b4ff (patch) | |
| tree | 5e57051bfb468358b15ee1a6bcd72f2687c7d2ca | |
| parent | fede5be2281c1d043dc8860c2f58098a601b006a (diff) | |
plat: imx8m: Replace the magic number rdc/csu index with enum type
Replace the magic number index with enum type to make RDC/CSU config
more clear for user.
Signed-off-by: Jacky Bai <ping.bai@nxp.com>
| -rw-r--r-- | plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 6 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 10 | ||||
| -rw-r--r-- | plat/imx/imx8m/include/imx_rdc.h | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c index 1f0e21cb..e649e4b6 100644 --- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c +++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c @@ -53,11 +53,11 @@ static const struct aipstz_cfg aipstz[] = { static const struct imx_rdc_cfg rdc[] = { /* Master domain assignment */ - RDC_MDAn(0x1, DID1), + RDC_MDAn(RDC_MDA_M4, DID1), /* peripherals domain permission */ - RDC_PDAPn(70, D1R | D1W), - RDC_PDAPn(105, D0R | D0W), + RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W), + RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W), /* memory region */ diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c index 0c856c75..1f101c8d 100644 --- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c @@ -52,11 +52,11 @@ static const struct aipstz_cfg aipstz[] = { static const struct imx_rdc_cfg rdc[] = { /* Master domain assignment */ - RDC_MDAn(0x1, DID1), + RDC_MDAn(RDC_MDA_M7, DID1), /* peripherals domain permission */ - RDC_PDAPn(70, D1R | D1W), - RDC_PDAPn(105, D0R | D0W), + RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W), + RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W), /* memory region */ RDC_MEM_REGIONn(16, 0x0, 0x0, 0xff), @@ -69,8 +69,8 @@ static const struct imx_rdc_cfg rdc[] = { static const struct imx_csu_cfg csu_cfg[] = { /* peripherals csl setting */ - CSU_CSLx(118, CSU_SEC_LEVEL_2, UNLOCKED), - CSU_CSLx(119, CSU_SEC_LEVEL_2, UNLOCKED), + CSU_CSLx(CSU_CSL_OCRAM, CSU_SEC_LEVEL_2, UNLOCKED), + CSU_CSLx(CSU_CSL_OCRAM_S, CSU_SEC_LEVEL_2, UNLOCKED), /* master HP0~1 */ diff --git a/plat/imx/imx8m/include/imx_rdc.h b/plat/imx/imx8m/include/imx_rdc.h index e25b0e6d..6efa4d1d 100644 --- a/plat/imx/imx8m/include/imx_rdc.h +++ b/plat/imx/imx8m/include/imx_rdc.h @@ -10,6 +10,7 @@ #include <lib/utils_def.h> #include <platform_def.h> +#include <imx_sec_def.h> #define MDAn(x) (IMX_RDC_BASE + 0x200 + (x) * 4) #define PDAPn(x) (IMX_RDC_BASE + 0x400 + (x) * 4) |