aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os/common/startup/ARMCAx-TZ/devices/SAMA5D2/boot.S1
-rw-r--r--os/common/startup/ARMCAx-TZ/devices/SAMA5D2/mmu.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/os/common/startup/ARMCAx-TZ/devices/SAMA5D2/boot.S b/os/common/startup/ARMCAx-TZ/devices/SAMA5D2/boot.S
index f8050f8c6..2635a01ec 100644
--- a/os/common/startup/ARMCAx-TZ/devices/SAMA5D2/boot.S
+++ b/os/common/startup/ARMCAx-TZ/devices/SAMA5D2/boot.S
@@ -99,7 +99,6 @@ Boot_Handler:
*/
ldr r0, =SCR_RESET_VAL // IRQ and ABT to monitor in secure mode
mcr p15, 0, r0, c1, c1, 0
-
b Reset_Handler
#endif /* !defined(__DOXYGEN__) */
diff --git a/os/common/startup/ARMCAx-TZ/devices/SAMA5D2/mmu.c b/os/common/startup/ARMCAx-TZ/devices/SAMA5D2/mmu.c
index 6da0272db..8d92d99ea 100644
--- a/os/common/startup/ARMCAx-TZ/devices/SAMA5D2/mmu.c
+++ b/os/common/startup/ARMCAx-TZ/devices/SAMA5D2/mmu.c
@@ -89,13 +89,13 @@ static uint32_t mmuTable[4096] CC_ALIGN(16384);
/*===========================================================================*/
/**
- * @brief MMU Module initialization.
+ * @brief Core/MMU Module initialization.
* @note This function is implicitly invoked on system initialization,
* there is no need to explicitly initialize the module.
*
* @notapi
*/
-void __mmu_init(void) {
+void __core_init(void) {
uint32_t pm;
/*