Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enhanced the TIVA examples to compile with chibios-21.11 #374

Merged
merged 19 commits into from
Jul 17, 2023
Merged

Enhanced the TIVA examples to compile with chibios-21.11 #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5581a38
Update halconf.h
bigjohnson Jul 12, 2023
2bc1f11
Update halconf.h
bigjohnson Jul 12, 2023
e435fbb
Update Makefile
bigjohnson Jul 12, 2023
95f2707
Update halconf.h
bigjohnson Jul 12, 2023
f202319
Create README.md
bigjohnson Jul 12, 2023
4c40bfb
Update README.md
bigjohnson Jul 12, 2023
8f022db
Update halconf.h
bigjohnson Jul 12, 2023
ddf2759
Update Makefile
bigjohnson Jul 12, 2023
1b1a84c
Create README.md
bigjohnson Jul 12, 2023
9e08fac
Create README.md
bigjohnson Jul 12, 2023
7f98c42
Update Makefile
bigjohnson Jul 12, 2023
f1db281
Update halconf.h
bigjohnson Jul 12, 2023
f6c98ef
Update halconf.h
bigjohnson Jul 12, 2023
b78d6d9
Update halconf.h
bigjohnson Jul 12, 2023
aa1281b
Update halconf.h
bigjohnson Jul 12, 2023
ffe8eaa
Update halconf.h
bigjohnson Jul 12, 2023
4998ba6
Update halconf.h
bigjohnson Jul 12, 2023
fa044a5
Update README.md
bigjohnson Jul 12, 2023
0f936be
Update README.md
bigjohnson Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ include $(CHIBIOS)/test/rt/rt_test.mk
include $(CHIBIOS)/test/oslib/oslib_test.mk

# Define linker script file here
LDSCRIPT= $(STARTUPLD)/TM4C123xH6.ld
#LDSCRIPT= $(STARTUPLD)/TM4C123xH6.ld
LDSCRIPT= $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xH6.ld

# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
Expand Down
1 change: 1 addition & 0 deletions demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Changed code to compile with chibios-21.11.x and added suggestion from [http://forum.chibios.org/viewtopic.php?t=5666](http://forum.chibios.org/viewtopic.php?t=5666)
13 changes: 8 additions & 5 deletions demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
#define HALCONF_H

#define _CHIBIOS_HAL_CONF_
#define _CHIBIOS_HAL_CONF_VER_8_0_
//#define _CHIBIOS_HAL_CONF_VER_8_0_
#define _CHIBIOS_HAL_CONF_VER_8_4_

#include "mcuconf.h"

Expand Down Expand Up @@ -209,9 +210,11 @@
* @brief Enables synchronous APIs.
* @note Disabling this option saves both code and data space.
*/
#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
#define PAL_USE_CALLBACKS FALSE
#endif
//#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
//#define PAL_USE_CALLBACKS FALSE
//#endif

#define PAL_USE_CALLBACKS TRUE

/**
* @brief Enables synchronous APIs.
Expand Down Expand Up @@ -526,7 +529,7 @@
#define WSPI_USE_MUTUAL_EXCLUSION TRUE
#endif

#include "halconf_community.h"
//#include "halconf_community.h"

#endif /* HALCONF_H */

Expand Down
3 changes: 2 additions & 1 deletion demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ include $(CHIBIOS)/os/common/ports/ARMv7-M/compilers/GCC/mk/port.mk
include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk

# Define linker script file here
LDSCRIPT= $(STARTUPLD)/TM4C129xNC.ld
#LDSCRIPT= $(STARTUPLD)/TM4C129xNC.ld
LDSCRIPT= $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xH6.ld

# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
Expand Down
4 changes: 4 additions & 0 deletions demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

Changed code to compile with chibios-20.3.x and added suggestion from [http://forum.chibios.org/viewtopic.php?t=5666](http://forum.chibios.org/viewtopic.php?t=5666)
I try some changes for compiling with chibios-21.11.x withouth success.
I will push it on the correct Chibios-Contrib branch
13 changes: 8 additions & 5 deletions demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
#define HALCONF_H

#define _CHIBIOS_HAL_CONF_
#define _CHIBIOS_HAL_CONF_VER_8_0_
//#define _CHIBIOS_HAL_CONF_VER_8_0_
define _CHIBIOS_HAL_CONF_VER_7_1_

#include "mcuconf.h"

Expand Down Expand Up @@ -209,9 +210,11 @@
* @brief Enables synchronous APIs.
* @note Disabling this option saves both code and data space.
*/
#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
#define PAL_USE_CALLBACKS FALSE
#endif
//#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
//#define PAL_USE_CALLBACKS FALSE
//#endif

#define PAL_USE_CALLBACKS TRUE

/**
* @brief Enables synchronous APIs.
Expand Down Expand Up @@ -526,7 +529,7 @@
#define WSPI_USE_MUTUAL_EXCLUSION TRUE
#endif

#include "halconf_community.h"
//#include "halconf_community.h"

#endif /* HALCONF_H */

Expand Down
3 changes: 2 additions & 1 deletion demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ include $(CHIBIOS)/test/rt/rt_test.mk
include $(CHIBIOS)/test/oslib/oslib_test.mk

# Define linker script file here
LDSCRIPT= $(STARTUPLD)/TM4C129xNC.ld
#LDSCRIPT= $(STARTUPLD)/TM4C129xNC.ld
LDSCRIPT= $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xH6.ld

# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
Expand Down
1 change: 1 addition & 0 deletions demos/TIVA/RT-TM4C1294-LAUNCHPAD/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Changed code to compile with chibios-21.11.x and added suggestion from [http://forum.chibios.org/viewtopic.php?t=5666](http://forum.chibios.org/viewtopic.php?t=5666)
12 changes: 7 additions & 5 deletions demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
#define HALCONF_H

#define _CHIBIOS_HAL_CONF_
#define _CHIBIOS_HAL_CONF_VER_8_0_
//#define _CHIBIOS_HAL_CONF_VER_8_0_
#define _CHIBIOS_HAL_CONF_VER_8_4_

#include "mcuconf.h"

Expand Down Expand Up @@ -209,9 +210,10 @@
* @brief Enables synchronous APIs.
* @note Disabling this option saves both code and data space.
*/
#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
#define PAL_USE_CALLBACKS FALSE
#endif
//#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
//#define PAL_USE_CALLBACKS FALSE
//#endif
#define PAL_USE_CALLBACKS TRUE

/**
* @brief Enables synchronous APIs.
Expand Down Expand Up @@ -526,7 +528,7 @@
#define WSPI_USE_MUTUAL_EXCLUSION TRUE
#endif

#include "halconf_community.h"
//#include "halconf_community.h"

#endif /* HALCONF_H */

Expand Down
Loading