Merge branch 'master' into developer

Conflicts: Makefile
2016-06-11 00:00:53 +02:00
parent ef60c8ea4c edfd63e1f7
commit 984c3e549c
25 changed files with 321 additions and 320 deletions
--- a/exceptions/arm11/source/mainHandler.c
+++ b/exceptions/arm11/source/mainHandler.c
@@ -91,7 +91,7 @@ void __attribute__((noreturn)) mainHandler(u32 regs[REG_DUMP_SIZE / 4], u32 type
    dumpHeader.totalSize = sizeof(ExceptionDumpHeader) + dumpHeader.registerDumpSize + dumpHeader.codeDumpSize + dumpHeader.stackDumpSize + dumpHeader.additionalDataSize;
    *(ExceptionDumpHeader *)final = dumpHeader;

-        
+    
    clearDCacheAndDMB();
-    mcuReboot();
+    mcuReboot(); //Also contains DCache-cleaning code
 }