diff options
| author | isiora <none@example.com> | 2018-01-18 09:40:45 +0000 |
|---|---|---|
| committer | isiora <none@example.com> | 2018-01-18 09:40:45 +0000 |
| commit | 560f7f9103c6353da9f3bf538991822606aba013 (patch) | |
| tree | 3fc2864ca4aa079ab7d710e6de21ecba18b39816 /os/common/startup | |
| parent | 9d24e49e12cbcff463ccaf2f0c30d96f03d00d53 (diff) | |
| download | ChibiOS-560f7f9103c6353da9f3bf538991822606aba013.tar.gz ChibiOS-560f7f9103c6353da9f3bf538991822606aba013.tar.bz2 ChibiOS-560f7f9103c6353da9f3bf538991822606aba013.zip | |
Minor changes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11320 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/common/startup')
| -rw-r--r-- | os/common/startup/ARMCAx-TZ/devices/SAMA5D2/boot.S | 1 | ||||
| -rw-r--r-- | os/common/startup/ARMCAx-TZ/devices/SAMA5D2/mmu.c | 4 |
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;
/*
|