Skip to content

Commit 7495382

Browse files
vmatosvmatos
committed
Updated to TivaWare 2.1.2.111 and FreeRTOS 8.2
1 parent a7fee53 commit 7495382

32 files changed

+213
-218
lines changed

‎examples_tm4c123/freertos_demo/FreeRTOSConfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
#define configUSE_RECURSIVE_MUTEXES 1
8383
#define configCHECK_FOR_STACK_OVERFLOW 2
8484

85-
#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 16 )
85+
#define configMAX_PRIORITIES 16
8686
#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
8787
#define configQUEUE_REGISTRY_SIZE 10
8888

‎examples_tm4c123/freertos_demo/Makefile‎

Lines changed: 114 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
1-
#******************************************************************************
2-
#
3-
# Makefile - Rules for building the FreeRTOS example.
4-
#
5-
# Copyright (c) 2012-2014 Texas Instruments Incorporated. All rights reserved.
6-
# Software License Agreement
7-
#
8-
# Texas Instruments (TI) is supplying this software for use solely and
9-
# exclusively on TI's microcontroller products. The software is owned by
10-
# TI and/or its suppliers, and is protected under applicable copyright
11-
# laws. You may not combine this software with "viral" open-source
12-
# software in order to form a larger program.
13-
#
14-
# THIS SOFTWARE IS PROVIDED "AS IS" AND WITH ALL FAULTS.
15-
# NO WARRANTIES, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT
16-
# NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
17-
# A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. TI SHALL NOT, UNDER ANY
18-
# CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
19-
# DAMAGES, FOR ANY REASON WHATSOEVER.
20-
#
21-
# This is part of revision 2.1.0.12573 of the EK-TM4C123GXL Firmware Package.
22-
#
23-
#******************************************************************************
24-
25-
#
26-
# Defines the part type that this project uses.
27-
#
28-
PART=TM4C123GH6PM
29-
30-
#
31-
# The base directory for TivaWare.
32-
#
33-
ROOT=../..
34-
35-
#
36-
# Include the common make definitions.
37-
#
38-
include ${ROOT}/makedefs
1+
#******************************************************************************
2+
#
3+
# Makefile - Rules for building the FreeRTOS example.
4+
#
5+
# Copyright (c) 2012-2015 Texas Instruments Incorporated. All rights reserved.
6+
# Software License Agreement
7+
#
8+
# Texas Instruments (TI) is supplying this software for use solely and
9+
# exclusively on TI's microcontroller products. The software is owned by
10+
# TI and/or its suppliers, and is protected under applicable copyright
11+
# laws. You may not combine this software with "viral" open-source
12+
# software in order to form a larger program.
13+
#
14+
# THIS SOFTWARE IS PROVIDED "AS IS" AND WITH ALL FAULTS.
15+
# NO WARRANTIES, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT
16+
# NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
17+
# A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. TI SHALL NOT, UNDER ANY
18+
# CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
19+
# DAMAGES, FOR ANY REASON WHATSOEVER.
20+
#
21+
# This is part of revision 2.1.2.111 of the EK-TM4C123GXL Firmware Package.
22+
#
23+
#******************************************************************************
3924

40-
#
41-
# Where to find header files that do not live in the source directory.
42-
#
25+
#
26+
# Defines the part type that this project uses.
27+
#
28+
PART=TM4C123GH6PM
29+
30+
#
31+
# The base directory for TivaWare.
32+
#
33+
ROOT=../..
34+
35+
#
36+
# Include the common make definitions.
37+
#
38+
include ${ROOT}/makedefs
39+
40+
#
41+
# Where to find header files that do not live in the source directory.
42+
#
4343
TIVAWARE=${ROOT}/../TivaWare
44-
45-
#
46-
# Where to find source files that do not live in this directory.
47-
#
48-
VPATH=../drivers
49-
VPATH+=${TIVAWARE}/third_party/FreeRTOS/Source/portable/GCC/ARM_CM4F
50-
VPATH+=${TIVAWARE}/third_party/FreeRTOS/Source/portable/MemMang/
51-
VPATH+=${TIVAWARE}/third_party/FreeRTOS/Source
52-
VPATH+=${TIVAWARE}/utils
53-
54-
#
55-
# Where to find header files that do not live in the source directory.
56-
#
57-
IPATH=.
58-
IPATH+=..
59-
IPATH+=${TIVAWARE}
60-
IPATH+=${TIVAWARE}/third_party/FreeRTOS/Source/portable/GCC/ARM_CM4F
61-
IPATH+=${TIVAWARE}/third_party/FreeRTOS
62-
IPATH+=${TIVAWARE}/third_party/FreeRTOS/Source/include
63-
IPATH+=${TIVAWARE}/third_party
64-
65-
#
66-
# The default rule, which causes the FreeRTOS example to be built.
67-
#
68-
all: ${COMPILER}
69-
all: ${COMPILER}/freertos_demo.axf
70-
71-
#
72-
# The rule to clean out all the build products.
73-
#
74-
clean:
75-
@rm -rf ${COMPILER} ${wildcard *~}
76-
77-
#
78-
# The rule to create the target directory.
79-
#
80-
${COMPILER}:
81-
@mkdir -p ${COMPILER}
82-
83-
#
84-
# The rule to flash
85-
#
86-
flash:
87-
@lm4flash ${COMPILER}/freertos_demo.bin
88-
89-
#
90-
# Rules for building the FreeRTOS example.
91-
#
92-
${COMPILER}/freertos_demo.axf: ${COMPILER}/buttons.o
93-
${COMPILER}/freertos_demo.axf: ${COMPILER}/freertos_demo.o
94-
${COMPILER}/freertos_demo.axf: ${COMPILER}/heap_2.o
95-
${COMPILER}/freertos_demo.axf: ${COMPILER}/led_task.o
96-
${COMPILER}/freertos_demo.axf: ${COMPILER}/list.o
97-
${COMPILER}/freertos_demo.axf: ${COMPILER}/port.o
98-
${COMPILER}/freertos_demo.axf: ${COMPILER}/queue.o
99-
${COMPILER}/freertos_demo.axf: ${COMPILER}/rgb.o
100-
${COMPILER}/freertos_demo.axf: ${COMPILER}/startup_${COMPILER}.o
101-
${COMPILER}/freertos_demo.axf: ${COMPILER}/switch_task.o
102-
${COMPILER}/freertos_demo.axf: ${COMPILER}/tasks.o
103-
${COMPILER}/freertos_demo.axf: ${COMPILER}/uartstdio.o
104-
${COMPILER}/freertos_demo.axf: ${COMPILER}/ustdlib.o
105-
${COMPILER}/freertos_demo.axf: ${TIVAWARE}/driverlib/${COMPILER}/libdriver.a
106-
${COMPILER}/freertos_demo.axf: freertos_demo.ld
107-
SCATTERgcc_freertos_demo=freertos_demo.ld
108-
ENTRY_freertos_demo=ResetISR
109-
CFLAGSgcc=-DTARGET_IS_TM4C123_RB1
110-
111-
#
112-
# Include the automatically generated dependency files.
113-
#
114-
ifneq (${MAKECMDGOALS},clean)
115-
-include ${wildcard ${COMPILER}/*.d} __dummy__
116-
endif
44+
45+
#
46+
# Where to find source files that do not live in this directory.
47+
#
48+
VPATH=../drivers
49+
VPATH+=${TIVAWARE}/third_party/FreeRTOS/Source/portable/GCC/ARM_CM4F
50+
VPATH+=${TIVAWARE}/third_party/FreeRTOS/Source/portable/MemMang/
51+
VPATH+=${TIVAWARE}/third_party/FreeRTOS/Source
52+
VPATH+=${TIVAWARE}/utils
53+
54+
#
55+
# Where to find header files that do not live in the source directory.
56+
#
57+
IPATH=.
58+
IPATH+=..
59+
IPATH+=${TIVAWARE}
60+
IPATH+=${TIVAWARE}/third_party/FreeRTOS/Source/portable/GCC/ARM_CM4F
61+
IPATH+=${TIVAWARE}/third_party/FreeRTOS
62+
IPATH+=${TIVAWARE}/third_party/FreeRTOS/Source/include
63+
IPATH+=${TIVAWARE}/third_party
64+
65+
#
66+
# The default rule, which causes the FreeRTOS example to be built.
67+
#
68+
all: ${COMPILER}
69+
all: ${COMPILER}/freertos_demo.axf
70+
71+
#
72+
# The rule to clean out all the build products.
73+
#
74+
clean:
75+
@rm -rf ${COMPILER} ${wildcard *~}
76+
77+
#
78+
# The rule to create the target directory.
79+
#
80+
${COMPILER}:
81+
@mkdir -p ${COMPILER}
82+
83+
#
84+
# The rule to flash
85+
#
86+
flash:
87+
@lm4flash ${COMPILER}/freertos_demo.bin
88+
89+
#
90+
# Rules for building the FreeRTOS example.
91+
#
92+
${COMPILER}/freertos_demo.axf: ${COMPILER}/buttons.o
93+
${COMPILER}/freertos_demo.axf: ${COMPILER}/freertos_demo.o
94+
${COMPILER}/freertos_demo.axf: ${COMPILER}/heap_2.o
95+
${COMPILER}/freertos_demo.axf: ${COMPILER}/led_task.o
96+
${COMPILER}/freertos_demo.axf: ${COMPILER}/list.o
97+
${COMPILER}/freertos_demo.axf: ${COMPILER}/port.o
98+
${COMPILER}/freertos_demo.axf: ${COMPILER}/queue.o
99+
${COMPILER}/freertos_demo.axf: ${COMPILER}/rgb.o
100+
${COMPILER}/freertos_demo.axf: ${COMPILER}/startup_${COMPILER}.o
101+
${COMPILER}/freertos_demo.axf: ${COMPILER}/switch_task.o
102+
${COMPILER}/freertos_demo.axf: ${COMPILER}/tasks.o
103+
${COMPILER}/freertos_demo.axf: ${COMPILER}/uartstdio.o
104+
${COMPILER}/freertos_demo.axf: ${COMPILER}/ustdlib.o
105+
${COMPILER}/freertos_demo.axf: ${TIVAWARE}/driverlib/${COMPILER}/libdriver.a
106+
${COMPILER}/freertos_demo.axf: freertos_demo.ld
107+
SCATTERgcc_freertos_demo=freertos_demo.ld
108+
ENTRY_freertos_demo=ResetISR
109+
CFLAGSgcc=-DTARGET_IS_TM4C123_RB1
110+
111+
#
112+
# Include the automatically generated dependency files.
113+
#
114+
ifneq (${MAKECMDGOALS},clean)
115+
-include ${wildcard ${COMPILER}/*.d} __dummy__
116+
endif

‎examples_tm4c123/freertos_demo/freertos_demo.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// freertos_demo.c - Simple FreeRTOS example.
44
//
5-
// Copyright (c) 2012-2014 Texas Instruments Incorporated. All rights reserved.
5+
// Copyright (c) 2012-2015 Texas Instruments Incorporated. All rights reserved.
66
// Software License Agreement
77
//
88
// Texas Instruments (TI) is supplying this software for use solely and
@@ -18,7 +18,7 @@
1818
// CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
1919
// DAMAGES, FOR ANY REASON WHATSOEVER.
2020
//
21-
// This is part of revision 2.1.0.12573 of the EK-TM4C123GXL Firmware Package.
21+
// This is part of revision 2.1.2.111 of the EK-TM4C123GXL Firmware Package.
2222
//
2323
//*****************************************************************************
2424

‎examples_tm4c123/freertos_demo/freertos_demo.ld‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* freertos_demo.ld - Linker configuration file for freertos_demo.
44
*
5-
* Copyright (c) 2012-2014 Texas Instruments Incorporated. All rights reserved.
5+
* Copyright (c) 2012-2015 Texas Instruments Incorporated. All rights reserved.
66
* Software License Agreement
77
*
88
* Texas Instruments (TI) is supplying this software for use solely and
@@ -18,7 +18,7 @@
1818
* CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
1919
* DAMAGES, FOR ANY REASON WHATSOEVER.
2020
*
21-
* This is part of revision 2.1.0.12573 of the EK-TM4C123GXL Firmware Package.
21+
* This is part of revision 2.1.2.111 of the EK-TM4C123GXL Firmware Package.
2222
*
2323
*****************************************************************************/
2424

@@ -42,6 +42,7 @@ SECTIONS
4242
.data : AT(ADDR(.text) + SIZEOF(.text))
4343
{
4444
_data = .;
45+
_ldata = LOADADDR (.data);
4546
*(vtable)
4647
*(.data*)
4748
_edata = .;

‎examples_tm4c123/freertos_demo/led_task.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// led_task.c - A simple flashing LED task.
44
//
5-
// Copyright (c) 2012-2014 Texas Instruments Incorporated. All rights reserved.
5+
// Copyright (c) 2012-2015 Texas Instruments Incorporated. All rights reserved.
66
// Software License Agreement
77
//
88
// Texas Instruments (TI) is supplying this software for use solely and
@@ -18,7 +18,7 @@
1818
// CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
1919
// DAMAGES, FOR ANY REASON WHATSOEVER.
2020
//
21-
// This is part of revision 2.1.0.12573 of the EK-TM4C123GXL Firmware Package.
21+
// This is part of revision 2.1.2.111 of the EK-TM4C123GXL Firmware Package.
2222
//
2323
//*****************************************************************************
2424

@@ -224,7 +224,7 @@ LEDTaskInit(void)
224224
//
225225
// Create the LED task.
226226
//
227-
if(xTaskCreate(LEDTask, (signed portCHAR *)"LED", LEDTASKSTACKSIZE, NULL,
227+
if(xTaskCreate(LEDTask, (const portCHAR *)"LED", LEDTASKSTACKSIZE, NULL,
228228
tskIDLE_PRIORITY + PRIORITY_LED_TASK, NULL) != pdTRUE)
229229
{
230230
return(1);

‎examples_tm4c123/freertos_demo/led_task.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// led_task.h - Prototypes for the LED task.
44
//
5-
// Copyright (c) 2012-2014 Texas Instruments Incorporated. All rights reserved.
5+
// Copyright (c) 2012-2015 Texas Instruments Incorporated. All rights reserved.
66
// Software License Agreement
77
//
88
// Texas Instruments (TI) is supplying this software for use solely and
@@ -18,7 +18,7 @@
1818
// CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
1919
// DAMAGES, FOR ANY REASON WHATSOEVER.
2020
//
21-
// This is part of revision 2.1.0.12573 of the EK-TM4C123GXL Firmware Package.
21+
// This is part of revision 2.1.2.111 of the EK-TM4C123GXL Firmware Package.
2222
//
2323
//*****************************************************************************
2424

‎examples_tm4c123/freertos_demo/priorities.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// priorities.h - Priorities for the various FreeRTOS tasks.
44
//
5-
// Copyright (c) 2012-2014 Texas Instruments Incorporated. All rights reserved.
5+
// Copyright (c) 2012-2015 Texas Instruments Incorporated. All rights reserved.
66
// Software License Agreement
77
//
88
// Texas Instruments (TI) is supplying this software for use solely and
@@ -18,7 +18,7 @@
1818
// CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
1919
// DAMAGES, FOR ANY REASON WHATSOEVER.
2020
//
21-
// This is part of revision 2.1.0.12573 of the EK-TM4C123GXL Firmware Package.
21+
// This is part of revision 2.1.2.111 of the EK-TM4C123GXL Firmware Package.
2222
//
2323
//*****************************************************************************
2424

‎examples_tm4c123/freertos_demo/readme.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ http://www.freertos.org/
3232

3333
-------------------------------------------------------------------------------
3434

35-
Copyright (c) 2012-2014 Texas Instruments Incorporated. All rights reserved.
35+
Copyright (c) 2012-2015 Texas Instruments Incorporated. All rights reserved.
3636
Software License Agreement
3737

3838
Texas Instruments (TI) is supplying this software for use solely and
@@ -48,4 +48,4 @@ A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. TI SHALL NOT, UNDER ANY
4848
CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
4949
DAMAGES, FOR ANY REASON WHATSOEVER.
5050

51-
This is part of revision 2.1.0.12573 of the EK-TM4C123GXL Firmware Package.
51+
This is part of revision 2.1.2.111 of the EK-TM4C123GXL Firmware Package.

‎examples_tm4c123/freertos_demo/startup_gcc.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// startup_gcc.c - Startup code for use with GNU tools.
44
//
5-
// Copyright (c) 2012-2014 Texas Instruments Incorporated. All rights reserved.
5+
// Copyright (c) 2012-2015 Texas Instruments Incorporated. All rights reserved.
66
// Software License Agreement
77
//
88
// Texas Instruments (TI) is supplying this software for use solely and
@@ -18,7 +18,7 @@
1818
// CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
1919
// DAMAGES, FOR ANY REASON WHATSOEVER.
2020
//
21-
// This is part of revision 2.1.0.12573 of the EK-TM4C123GXL Firmware Package.
21+
// This is part of revision 2.1.2.111 of the EK-TM4C123GXL Firmware Package.
2222
//
2323
//*****************************************************************************
2424

@@ -233,7 +233,7 @@ void (* const g_pfnVectors[])(void) =
233233
// for the "data" segment resides immediately following the "text" segment.
234234
//
235235
//*****************************************************************************
236-
extern uint32_t _etext;
236+
extern uint32_t _ldata;
237237
extern uint32_t _data;
238238
extern uint32_t _edata;
239239
extern uint32_t _bss;
@@ -257,7 +257,7 @@ ResetISR(void)
257257
//
258258
// Copy the data segment initializers from flash to SRAM.
259259
//
260-
pui32Src = &_etext;
260+
pui32Src = &_ldata;
261261
for(pui32Dest = &_data; pui32Dest < &_edata; )
262262
{
263263
*pui32Dest++ = *pui32Src++;

0 commit comments

Comments
 (0)