From 560f7f9103c6353da9f3bf538991822606aba013 Mon Sep 17 00:00:00 2001 From: isiora Date: Thu, 18 Jan 2018 09:40:45 +0000 Subject: Minor changes. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11320 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/common/startup/ARMCAx-TZ/devices/SAMA5D2/boot.S | 1 - os/common/startup/ARMCAx-TZ/devices/SAMA5D2/mmu.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'os/common') 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; /* -- cgit v1.2.3