diff options
| author | Silvano di Ninno <silvano.dininno@nxp.com> | 2020-03-25 09:43:52 +0100 |
|---|---|---|
| committer | Silvano di Ninno <silvano.dininno@nxp.com> | 2020-03-27 12:26:42 +0100 |
| commit | 81f6715805917f0e94deb7437d601e7698516bfa (patch) | |
| tree | 45293f8fcbb8da45022052f680bfa0fae51c796d | |
| parent | b067e6d30f8272f3cea192888c220ea0256f7510 (diff) | |
plat: imx8mq/mm/mn: Cleanup bl31_setup
Align code style between 8mq, 8mm and 8mn files.
Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
| -rw-r--r-- | plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 4 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 6 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c index 22f1da93..51e6891c 100644 --- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c +++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c @@ -101,7 +101,7 @@ static uint32_t get_spsr_for_bl33_entry(void) return spsr; } -void bl31_tzc380_setup(void) +static void bl31_tzc380_setup(void) { unsigned int val; @@ -118,7 +118,7 @@ void bl31_tzc380_setup(void) /* Enable 1G-5G S/NS RW */ tzc380_configure_region(0, 0x00000000, TZC_ATTR_REGION_SIZE(TZC_REGION_SIZE_4G) | - TZC_ATTR_REGION_EN_MASK | TZC_ATTR_SP_ALL); + TZC_ATTR_REGION_EN_MASK | TZC_ATTR_SP_ALL); } void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c index eaa4492a..b32c81c0 100644 --- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c @@ -84,7 +84,6 @@ static const struct imx_csu_cfg csu_cfg[] = { {0} }; - static entry_point_info_t bl32_image_ep_info; static entry_point_info_t bl33_image_ep_info; @@ -105,7 +104,7 @@ static uint32_t get_spsr_for_bl33_entry(void) return spsr; } -void bl31_tzc380_setup(void) +static void bl31_tzc380_setup(void) { unsigned int val; @@ -122,7 +121,7 @@ void bl31_tzc380_setup(void) /* Enable 1G-5G S/NS RW */ tzc380_configure_region(0, 0x00000000, TZC_ATTR_REGION_SIZE(TZC_REGION_SIZE_4G) | - TZC_ATTR_REGION_EN_MASK | TZC_ATTR_SP_ALL); + TZC_ATTR_REGION_EN_MASK | TZC_ATTR_SP_ALL); } void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, @@ -196,7 +195,6 @@ void bl31_plat_arch_setup(void) (BL_COHERENT_RAM_END - BL_COHERENT_RAM_BASE), MT_DEVICE | MT_RW | MT_SECURE); #endif - // Map TEE memory mmap_add_region(BL32_BASE, BL32_BASE, BL32_SIZE, MT_MEMORY | MT_RW); diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c index b7ebfaa7..304dae3e 100644 --- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c @@ -110,7 +110,7 @@ static uint32_t get_spsr_for_bl33_entry(void) return spsr; } -static void bl31_tz380_setup(void) +static void bl31_tzc380_setup(void) { unsigned int val; @@ -176,7 +176,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, #endif #endif - bl31_tz380_setup(); + bl31_tzc380_setup(); } void bl31_plat_arch_setup(void) |