From 5581a38d0fbf08f1d199e6348a974ad73bfff034 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:01:50 +0200 Subject: [PATCH 01/19] Update halconf.h Commented halconf_community.h inclusion --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h index f9e8d6dd9e..6f58e116ec 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h @@ -526,7 +526,7 @@ #define WSPI_USE_MUTUAL_EXCLUSION TRUE #endif -#include "halconf_community.h" +//#include "halconf_community.h" #endif /* HALCONF_H */ From 2bc1f11bba98624f2e939bdcd4e849edccf99f4f Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:04:48 +0200 Subject: [PATCH 02/19] Update halconf.h Upgraded _CHIBIOS_HAL_CONF_VER_8_4_ to 21.11 halconf --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h index 6f58e116ec..cf367dd73f 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h @@ -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" From e435fbb6e4c911beb0a965a4fe89d61eb9894b51 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:06:19 +0200 Subject: [PATCH 03/19] Update Makefile Correct LDSCRIPT --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile index 6590e8a0e0..6c6899bd88 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile @@ -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. From 95f2707df9b4b52d0eaef34fc791771109b97e76 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:08:12 +0200 Subject: [PATCH 04/19] Update halconf.h Correct PAL_USE_CALLBACKS --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h index cf367dd73f..7efe7e1d71 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h @@ -211,7 +211,9 @@ * @note Disabling this option saves both code and data space. */ #if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) -#define PAL_USE_CALLBACKS FALSE +//#define PAL_USE_CALLBACKS FALSE +#define PAL_USE_CALLBACKS TRUE + #endif /** From f2023191bf1db8f1e15d4093d0741764dc5b8f04 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:12:18 +0200 Subject: [PATCH 05/19] Create README.md --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md new file mode 100644 index 0000000000..ccc9bd67dc --- /dev/null +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md @@ -0,0 +1 @@ +xx From 4c40bfbbf0e0e6b8d8762316e4a0f6c4783f8274 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:14:51 +0200 Subject: [PATCH 06/19] Update README.md --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md index ccc9bd67dc..8b577d4d58 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/README.md @@ -1 +1 @@ -xx +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) From 8f022dbb1dac4c7a1d93de271c3b0b3100d50108 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:19:20 +0200 Subject: [PATCH 07/19] Update halconf.h Correct some issues --- demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h index f9e8d6dd9e..ccfd737d24 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h @@ -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" @@ -210,7 +211,8 @@ * @note Disabling this option saves both code and data space. */ #if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) -#define PAL_USE_CALLBACKS FALSE +//#define PAL_USE_CALLBACKS FALSE +#define PAL_USE_CALLBACKS TRUE #endif /** @@ -526,7 +528,7 @@ #define WSPI_USE_MUTUAL_EXCLUSION TRUE #endif -#include "halconf_community.h" +//#include "halconf_community.h" #endif /* HALCONF_H */ From ddf2759ec4a098f8398f264496c4ece4a1572d43 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:20:33 +0200 Subject: [PATCH 08/19] Update Makefile --- demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile index 2b92211778..ce6335c873 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile @@ -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. From 1b1a84caafd1378638876ac1be598efdf9eaba8a Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:23:24 +0200 Subject: [PATCH 09/19] Create README.md --- demos/TIVA/RT-TM4C1294-LAUNCHPAD/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 demos/TIVA/RT-TM4C1294-LAUNCHPAD/README.md diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/README.md b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/README.md new file mode 100644 index 0000000000..8b577d4d58 --- /dev/null +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/README.md @@ -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) From 9e08fac3d2b17fc44e9f4ffb9fee0c22d5c76025 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:27:20 +0200 Subject: [PATCH 10/19] Create README.md --- demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md @@ -0,0 +1 @@ + From 7f98c42217c3c57f0a250fbc29dfd434aa745269 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:29:22 +0200 Subject: [PATCH 11/19] Update Makefile --- demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile index 7f38e2b480..c5cc15409e 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile @@ -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. From f1db2815fc1f5eb12df4a7668234a33c073d5314 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:31:59 +0200 Subject: [PATCH 12/19] Update halconf.h --- demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h index 315c995daa..c6d9b84440 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h @@ -210,7 +210,8 @@ * @note Disabling this option saves both code and data space. */ #if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) -#define PAL_USE_CALLBACKS FALSE +//#define PAL_USE_CALLBACKS FALSE +#define PAL_USE_CALLBACKS TRUE #endif /** @@ -526,7 +527,7 @@ #define WSPI_USE_MUTUAL_EXCLUSION TRUE #endif -#include "halconf_community.h" +//#include "halconf_community.h" #endif /* HALCONF_H */ From f6c98ef72d05fec814dbb8b720e4f5a82a0e12f3 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:33:04 +0200 Subject: [PATCH 13/19] Update halconf.h --- demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h index c6d9b84440..1c27a6ae5a 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h @@ -209,10 +209,11 @@ * @brief Enables synchronous APIs. * @note Disabling this option saves both code and data space. */ -#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) +//#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) //#define PAL_USE_CALLBACKS FALSE +//#endif + #define PAL_USE_CALLBACKS TRUE -#endif /** * @brief Enables synchronous APIs. From b78d6d99ab7a7edaba4636c8a0aacd52a1c3645e Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:34:38 +0200 Subject: [PATCH 14/19] Update halconf.h --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h index 7efe7e1d71..1c1c876c3d 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h @@ -210,12 +210,11 @@ * @brief Enables synchronous APIs. * @note Disabling this option saves both code and data space. */ -#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) +//#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) //#define PAL_USE_CALLBACKS FALSE +//#endif #define PAL_USE_CALLBACKS TRUE -#endif - /** * @brief Enables synchronous APIs. * @note Disabling this option saves both code and data space. From aa1281b5f2d5b8b19a398d409db6b5ad41ac03d1 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:35:43 +0200 Subject: [PATCH 15/19] Update halconf.h --- demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h index ccfd737d24..1c1c876c3d 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h @@ -210,10 +210,10 @@ * @brief Enables synchronous APIs. * @note Disabling this option saves both code and data space. */ -#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) +//#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) //#define PAL_USE_CALLBACKS FALSE +//#endif #define PAL_USE_CALLBACKS TRUE -#endif /** * @brief Enables synchronous APIs. From ffe8eaacff83335faa1c48a28e23894167b7e22f Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:36:25 +0200 Subject: [PATCH 16/19] Update halconf.h --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h | 1 + 1 file changed, 1 insertion(+) diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h index 1c1c876c3d..c8d1c04c2d 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/halconf.h @@ -213,6 +213,7 @@ //#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) //#define PAL_USE_CALLBACKS FALSE //#endif + #define PAL_USE_CALLBACKS TRUE /** From 4998ba64500a7228a7ba6eddf869955321638551 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:38:57 +0200 Subject: [PATCH 17/19] Update halconf.h --- demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h index 1c27a6ae5a..abcff511bf 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/halconf.h @@ -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" From fa044a5fe45a6aac6406ff0773c81435fb1603b0 Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:40:41 +0200 Subject: [PATCH 18/19] Update README.md --- demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md index 8b13789179..4d106543ff 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md @@ -1 +1,3 @@ +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. From 0f936be7795e7c5068542c562fb46ba4d4f4c4fc Mon Sep 17 00:00:00 2001 From: Alberto Panu Date: Wed, 12 Jul 2023 17:44:15 +0200 Subject: [PATCH 19/19] Update README.md --- demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md index 4d106543ff..5dc48e8f0d 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/README.md @@ -1,3 +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