Skip to content

Commit 03f722f

Browse files
committed
Merge branch 'patch/release/v11_1_0/rx140_pg_dev' into 'release/rx'
[Fix] Use src/frtos_config/FreeRTOSConfig.h to match hard-coded settings in SC See merge request products/common/rtos/amazon-freertos/kernel/freertos-kernel!13
2 parents 844d424 + 40c4932 commit 03f722f

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

configuration/freertos.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
</incdir>
155155
<incdir>
156156
<path>src/frtos_startup</path>
157-
<path>src/application/config</path>
157+
<path>src/frtos_config</path>
158158
<path>src/application/startup</path>
159159
</incdir>
160160
<!-- copy source codes -->
@@ -174,7 +174,7 @@
174174
</impdir>
175175
<impdir>
176176
<folder>configuration/config_files</folder>
177-
<path>src/application/config</path>
177+
<path>src/frtos_config</path>
178178
</impdir>
179179
<impdir>
180180
<folder>configuration/startup</folder>
@@ -358,41 +358,41 @@
358358
<!-- The redundant zero number before a numerical data may cause it to be wrong, because some numerical data are input of an javascript engine -->
359359
<heap>
360360
<property id="configUSE_TRACE_FACILITY">
361-
<path>src/application/config/FreeRTOSConfig.h</path>
361+
<path>src/frtos_config/FreeRTOSConfig.h</path>
362362
</property>
363363
<property id="configUSE_MUTEXES">
364-
<path>src/application/config/FreeRTOSConfig.h</path>
364+
<path>src/frtos_config/FreeRTOSConfig.h</path>
365365
</property>
366366
<property id="configUSE_APPLICATION_TASK_TAG">
367-
<path>src/application/config/FreeRTOSConfig.h</path>
367+
<path>src/frtos_config/FreeRTOSConfig.h</path>
368368
</property>
369369
<property id="configUSE_QUEUE_SETS">
370370
<id>configUSE_QUEUE_SETS</id>
371-
<path>src/application/config/FreeRTOSConfig.h</path>
371+
<path>src/frtos_config/FreeRTOSConfig.h</path>
372372
</property>
373373
<property id="configRECORD_STACK_HIGH_ADDRESS">
374-
<priorityPath>src/application/config/FreeRTOSConfig.h</priorityPath>
374+
<priorityPath>src/frtos_config/FreeRTOSConfig.h</priorityPath>
375375
<path>src/FreeRTOS/Source/include/FreeRTOS.h</path>
376376
</property>
377377
<property id="configNUM_THREAD_LOCAL_STORAGE_POINTERS">
378-
<priorityPath>src/application/config/FreeRTOSConfig.h</priorityPath>
378+
<priorityPath>src/frtos_config/FreeRTOSConfig.h</priorityPath>
379379
<path>src/FreeRTOS/Source/include/FreeRTOS.h</path>
380380
</property>
381381
<property id="configUSE_TASK_NOTIFICATIONS">
382-
<priorityPath>src/application/config/FreeRTOSConfig.h</priorityPath>
382+
<priorityPath>src/frtos_config/FreeRTOSConfig.h</priorityPath>
383383
<path>src/FreeRTOS/Source/include/FreeRTOS.h</path>
384384
</property>
385385
<property id="configSUPPORT_STATIC_ALLOCATION">
386-
<priorityPath>src/application/config/FreeRTOSConfig.h</priorityPath>
386+
<priorityPath>src/frtos_config/FreeRTOSConfig.h</priorityPath>
387387
<path>src/FreeRTOS/Source/include/FreeRTOS.h</path>
388388
</property>
389389
<property id="configSUPPORT_DYNAMIC_ALLOCATION">
390390
<id>configSUPPORT_DYNAMIC_ALLOCATION</id>
391-
<priorityPath>src/application/config/FreeRTOSConfig.h</priorityPath>
391+
<priorityPath>src/frtos_config/FreeRTOSConfig.h</priorityPath>
392392
<path>src/FreeRTOS/Source/include/FreeRTOS.h</path>
393393
</property>
394394
<property id="configGENERATE_RUN_TIME_STATS">
395-
<priorityPath>src/application/config/FreeRTOSConfig.h</priorityPath>
395+
<priorityPath>src/frtos_config/FreeRTOSConfig.h</priorityPath>
396396
<path>src/FreeRTOS/Source/include/FreeRTOS.h</path>
397397
</property>
398398
<property id="portBYTE_ALIGNMENT">
@@ -484,16 +484,16 @@
484484
<dependency>portBYTE_ALIGNMENT</dependency>
485485
</property>
486486
<property id="configMINIMAL_STACK_SIZE">
487-
<path>src/application/config/FreeRTOSConfig.h</path>
487+
<path>src/frtos_config/FreeRTOSConfig.h</path>
488488
</property>
489489
<property id="configTIMER_TASK_STACK_DEPTH">
490-
<path>src/application/config/FreeRTOSConfig.h</path>
490+
<path>src/frtos_config/FreeRTOSConfig.h</path>
491491
</property>
492492
<property id="configTIMER_QUEUE_LENGTH">
493-
<path>src/application/config/FreeRTOSConfig.h</path>
493+
<path>src/frtos_config/FreeRTOSConfig.h</path>
494494
</property>
495495
<property id="configUSE_TIMERS">
496-
<path>src/application/config/FreeRTOSConfig.h</path>
496+
<path>src/frtos_config/FreeRTOSConfig.h</path>
497497
</property>
498498
<controlBlock id="TaskControlBlock" value="72">
499499
<addition>

0 commit comments

Comments
 (0)