From 2bbee81c287e8b5f42952c6f243ecaa2eed1aecd Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 31 May 2023 15:53:43 -0400 Subject: [PATCH] port to 20 --- demos/STM32/RT-AT32F435-ARTERY144/Makefile | 4 ++-- demos/STM32/RT-AT32F435-ARTERY144/cfg/chconf.h | 2 +- demos/STM32/RT-AT32F435-ARTERY144/cfg/halconf.h | 2 +- os/hal/ports/AT32/AT32F4xx/at32_isr.c | 2 -- os/hal/ports/AT32/AT32F4xx/platform.mk | 1 - 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/demos/STM32/RT-AT32F435-ARTERY144/Makefile b/demos/STM32/RT-AT32F435-ARTERY144/Makefile index 730219c80..c6b2316f1 100644 --- a/demos/STM32/RT-AT32F435-ARTERY144/Makefile +++ b/demos/STM32/RT-AT32F435-ARTERY144/Makefile @@ -105,11 +105,11 @@ include $(CHIBIOS)/os/hal/boards/AT_START_F435/board.mk include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk -include $(CHIBIOS)/os/common/ports/ARMv7-M/compilers/GCC/mk/port.mk +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Auto-build files in ./source recursively. include $(CHIBIOS)/tools/mk/autobuild.mk # Other files (optional). -include $(CHIBIOS)/os/test/test.mk +include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/rt/rt_test.mk include $(CHIBIOS)/test/oslib/oslib_test.mk diff --git a/demos/STM32/RT-AT32F435-ARTERY144/cfg/chconf.h b/demos/STM32/RT-AT32F435-ARTERY144/cfg/chconf.h index aa2399273..a51b09f4d 100644 --- a/demos/STM32/RT-AT32F435-ARTERY144/cfg/chconf.h +++ b/demos/STM32/RT-AT32F435-ARTERY144/cfg/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_RT_CONF_ -#define _CHIBIOS_RT_CONF_VER_7_0_ +#define _CHIBIOS_RT_CONF_VER_6_1_ /*===========================================================================*/ /** diff --git a/demos/STM32/RT-AT32F435-ARTERY144/cfg/halconf.h b/demos/STM32/RT-AT32F435-ARTERY144/cfg/halconf.h index a89a1c7ca..6dba79884 100644 --- a/demos/STM32/RT-AT32F435-ARTERY144/cfg/halconf.h +++ b/demos/STM32/RT-AT32F435-ARTERY144/cfg/halconf.h @@ -29,7 +29,7 @@ #define HALCONF_H #define _CHIBIOS_HAL_CONF_ -#define _CHIBIOS_HAL_CONF_VER_8_4_ +#define _CHIBIOS_HAL_CONF_VER_7_1_ #include "mcuconf.h" diff --git a/os/hal/ports/AT32/AT32F4xx/at32_isr.c b/os/hal/ports/AT32/AT32F4xx/at32_isr.c index 6c302a190..d4a42a35e 100644 --- a/os/hal/ports/AT32/AT32F4xx/at32_isr.c +++ b/os/hal/ports/AT32/AT32F4xx/at32_isr.c @@ -74,8 +74,6 @@ #include "stm32_usart6.inc" #include "stm32_uart7.inc" #include "stm32_uart8.inc" -#include "stm32_uart9.inc" -#include "stm32_uart10.inc" #include "stm32_tim1_9_10_11.inc" #include "stm32_tim2.inc" diff --git a/os/hal/ports/AT32/AT32F4xx/platform.mk b/os/hal/ports/AT32/AT32F4xx/platform.mk index a2e61c60c..8cf6d3560 100644 --- a/os/hal/ports/AT32/AT32F4xx/platform.mk +++ b/os/hal/ports/AT32/AT32F4xx/platform.mk @@ -40,7 +40,6 @@ include $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/driver_v2.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/SDIOv1/driver.mk -include $(CHIBIOS)/os/hal/ports/STM32/LLD/SYSTICKv1/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv1/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/xWDGv1/driver.mk