diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-02-22 15:23:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 15:23:52 +0000 |
| commit | ab3d22473df279c61ed4d4873d26b072dcf887e8 (patch) | |
| tree | bcfbba7909ca4be9bb71c2324be9fb43d65168ea /plat | |
| parent | 3f995f3078a9a22c5079e3d05995e26173ff6499 (diff) | |
| parent | b053a22e8a538d3ee6114c0ce7f25fa49f0302d8 (diff) | |
| download | platform_external_arm-trusted-firmware-ab3d22473df279c61ed4d4873d26b072dcf887e8.tar.gz platform_external_arm-trusted-firmware-ab3d22473df279c61ed4d4873d26b072dcf887e8.tar.bz2 platform_external_arm-trusted-firmware-ab3d22473df279c61ed4d4873d26b072dcf887e8.zip | |
Merge pull request #1836 from Yann-lms/docs_and_m4
Update documentation for STM32MP1 and add Cortex-M4 support
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/st/stm32mp1/bl2_plat_setup.c | 3 | ||||
| -rw-r--r-- | plat/st/stm32mp1/stm32mp1_def.h | 1 | ||||
| -rw-r--r-- | plat/st/stm32mp1/stm32mp1_security.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/plat/st/stm32mp1/bl2_plat_setup.c b/plat/st/stm32mp1/bl2_plat_setup.c index c7bc39f4e..2477954b0 100644 --- a/plat/st/stm32mp1/bl2_plat_setup.c +++ b/plat/st/stm32mp1/bl2_plat_setup.c @@ -202,6 +202,9 @@ void bl2_el3_plat_arch_setup(void) mmio_clrbits_32(rcc_base + RCC_BDCR, RCC_BDCR_VSWRST); } + /* Disable MCKPROT */ + mmio_clrbits_32(rcc_base + RCC_TZCR, RCC_TZCR_MCKPROT); + generic_delay_timer_init(); if (stm32mp1_clk_probe() < 0) { diff --git a/plat/st/stm32mp1/stm32mp1_def.h b/plat/st/stm32mp1/stm32mp1_def.h index f0dc575e2..1c897bdf4 100644 --- a/plat/st/stm32mp1/stm32mp1_def.h +++ b/plat/st/stm32mp1/stm32mp1_def.h @@ -183,6 +183,7 @@ enum ddr_type { #define STM32MP1_TZC_BASE U(0x5C006000) #define STM32MP1_TZC_A7_ID U(0) +#define STM32MP1_TZC_M4_ID U(1) #define STM32MP1_TZC_LCD_ID U(3) #define STM32MP1_TZC_GPU_ID U(4) #define STM32MP1_TZC_MDMA_ID U(5) diff --git a/plat/st/stm32mp1/stm32mp1_security.c b/plat/st/stm32mp1/stm32mp1_security.c index ebf1587a6..0ad43e435 100644 --- a/plat/st/stm32mp1/stm32mp1_security.c +++ b/plat/st/stm32mp1/stm32mp1_security.c @@ -41,6 +41,7 @@ static void init_tzc400(void) TZC_REGION_ACCESS_RDWR(STM32MP1_TZC_GPU_ID) | TZC_REGION_ACCESS_RDWR(STM32MP1_TZC_LCD_ID) | TZC_REGION_ACCESS_RDWR(STM32MP1_TZC_MDMA_ID) | + TZC_REGION_ACCESS_RDWR(STM32MP1_TZC_M4_ID) | TZC_REGION_ACCESS_RDWR(STM32MP1_TZC_DMA_ID) | TZC_REGION_ACCESS_RDWR(STM32MP1_TZC_USB_HOST_ID) | TZC_REGION_ACCESS_RDWR(STM32MP1_TZC_USB_OTG_ID) | |