Changed the MicroBlaze demo back to using heap_3.c having updated the linker script generation.

This commit is contained in:
Richard Barry 2011-08-24 12:38:38 +00:00
parent 08d7c89175
commit 39f8526265
3 changed files with 30 additions and 22 deletions

View file

@ -68,7 +68,7 @@ IF EXIST FreeRTOS_Source Goto END
copy %FREERTOS_SOURCE%\portable\MemMang\heap_3.c FreeRTOS_Source\portable\MemMang copy %FREERTOS_SOURCE%\portable\MemMang\heap_3.c FreeRTOS_Source\portable\MemMang
REM Copy the basic memory allocation files into the BSP directory REM Copy the basic memory allocation files into the BSP directory
copy %FREERTOS_SOURCE%\portable\MemMang\heap_2.c %BSP_SOURCE%\portable\MemMang copy %FREERTOS_SOURCE%\portable\MemMang\heap_3.c %BSP_SOURCE%\portable\MemMang
REM Copy the files that define the common demo tasks. REM Copy the files that define the common demo tasks.
copy %COMMON_SOURCE%\dynamic.c Demo_Source copy %COMMON_SOURCE%\dynamic.c Demo_Source

View file

@ -422,6 +422,13 @@ void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName
void vApplicationIdleHook( void ) void vApplicationIdleHook( void )
{ {
#ifdef EXAMPLE_CODE_ONLY
The following code can only be included if heap_1.c or heap_2.c is used in
the project. By default, heap_3.c is used, so the example code is
excluded. See http://www.freertos.org/a00111.html for more information on
memory management options.
volatile size_t xFreeHeapSpace; volatile size_t xFreeHeapSpace;
/* vApplicationIdleHook() will only be called if configUSE_IDLE_HOOK is set /* vApplicationIdleHook() will only be called if configUSE_IDLE_HOOK is set
@ -445,6 +452,7 @@ volatile size_t xFreeHeapSpace;
the value of configTOTAL_HEAP_SIZE in FreeRTOSConfig.h can be the value of configTOTAL_HEAP_SIZE in FreeRTOSConfig.h can be
reduced accordingly. */ reduced accordingly. */
} }
#endif
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/

View file

@ -11,7 +11,7 @@
/*******************************************************************/ /*******************************************************************/
_STACK_SIZE = DEFINED(_STACK_SIZE) ? _STACK_SIZE : 0x400; _STACK_SIZE = DEFINED(_STACK_SIZE) ? _STACK_SIZE : 0x400;
_HEAP_SIZE = DEFINED(_HEAP_SIZE) ? _HEAP_SIZE : 0x8; _HEAP_SIZE = DEFINED(_HEAP_SIZE) ? _HEAP_SIZE : 0x10400;
/* Define Memories in the system */ /* Define Memories in the system */