Skip to content

Commit 93a35f8

Browse files
SkptakSoren Ptak
and
Soren Ptak
authored
Added two config options to the FreeRTOSConfig file to get the demo running again. Fixed a typo in a file. Added a section to the link file (FreeRTOS#940)
Co-authored-by: Soren Ptak <[email protected]>
1 parent 408c384 commit 93a35f8

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/FreeRTOSConfig.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ standard names. */
148148

149149
/* Normal assert() semantics without relying on the provision of an assert.h
150150
header file. */
151-
#define configASSERT( x ) if( ( x ) == 0UL ) { portDISABLE_INTERRUPTS(); for( ;; ); }
151+
#define configASSERT( x ) if( ! ( x ) ) { portDISABLE_INTERRUPTS(); for( ;; ); }
152152

153153
/* LED not used at present, so just increment a variable to keep a count of the
154154
number of times the LED would otherwise have been toggled. */
@@ -166,6 +166,11 @@ solely for the purpose of ensuring parameters are passed into tasks correctly. *
166166
#define configREG_TEST_TASK_3_PARAMETER ( ( void * ) 0x12345678 )
167167
#define configREG_TEST_TASK_4_PARAMETER ( ( void * ) 0x87654321 )
168168

169+
/* Ensure that all system calls are coming from the kernel
170+
Additionally allow unprivileged tasks to have critical sections. */
171+
#define configENFORCE_SYSTEM_CALLS_FROM_KERNEL_ONLY 1
172+
#define configALLOW_UNPRIVILEGED_CRITICAL_SECTIONS 1
173+
169174
#ifdef __cplusplus
170175
}
171176
#endif

FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/GCC_Specific/sections.ld

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,13 @@ SECTIONS
156156
PROVIDE_HIDDEN (__fini_array_end = .);
157157
. = ALIGN(4);
158158

159+
/* Set start of system calls to here */
160+
__syscalls_flash_start__ = .;
161+
/* Place all FreeRTOS System calls here */
162+
*(freertos_system_calls)
163+
__syscalls_flash_end__ = .;
164+
/* Mark the end of the system calls */
165+
159166
. = ALIGN(4);
160167

161168
*(.text*) /* all remaining code */

FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/GCC_Specific/startup_ARMCM4.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Version: V2.0
55
* Date: 16 August 2013
66
*
7-
/* Copyright (c) 2011 - 2013 ARM LIMITED
7+
* Copyright (c) 2011 - 2013 ARM LIMITED
88
99
All rights reserved.
1010
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)