diff --git a/Platforms/IPSS/ARMv81MML/LinkScripts/AC6/lnk.sct b/Platforms/IPSS/ARMv81MML/LinkScripts/AC6/lnk.sct index 923e3952..35eefe4e 100755 --- a/Platforms/IPSS/ARMv81MML/LinkScripts/AC6/lnk.sct +++ b/Platforms/IPSS/ARMv81MML/LinkScripts/AC6/lnk.sct @@ -22,8 +22,8 @@ LOAD_REGION 0x0 * (+RW,+ZI) } - ARM_LIB_STACK 0x21000000 ALIGN 64 EMPTY 0x00002000 + ARM_LIB_STACK 0x21000000 ALIGN 64 EMPTY -0x00002000 {} - ARM_LIB_HEAP 0x22000000 ALIGN 64 EMPTY 0x00100000 + ARM_LIB_HEAP 0x21000000 ALIGN 64 EMPTY 0x00100000 {} } diff --git a/Platforms/IPSS/ARMv81MML/system_ARMv81MML.c b/Platforms/IPSS/ARMv81MML/system_ARMv81MML.c index 7fef3e97..d77ec9fb 100755 --- a/Platforms/IPSS/ARMv81MML/system_ARMv81MML.c +++ b/Platforms/IPSS/ARMv81MML/system_ARMv81MML.c @@ -240,8 +240,6 @@ typedef struct #define SERIAL_DATA *((volatile unsigned *) SERIAL_BASE_ADDRESS) - - int stdout_putchar(char txchar) { @@ -258,6 +256,8 @@ void ttywrch (int ch) stdout_putchar(ch); } + + /*---------------------------------------------------------------------------- System initialization function *----------------------------------------------------------------------------*/ @@ -289,7 +289,7 @@ void SystemInit (void) // enable DL branch cache CCR |= CCR_DL; - + __ISB(); } diff --git a/Testing/FrameworkSource/Timing.cpp b/Testing/FrameworkSource/Timing.cpp index ccf7c139..854902fa 100644 --- a/Testing/FrameworkSource/Timing.cpp +++ b/Testing/FrameworkSource/Timing.cpp @@ -69,8 +69,9 @@ unsigned long sectionCounter=0; void initCycleMeasurement() { #ifdef CORTEXM - SysTick->CTRL = 0; SysTick->LOAD = SYSTICK_INITIAL_VALUE; + SysTick->VAL = 0; + SysTick->CTRL = 0; #endif #ifdef CORTEXA