From 5be4d1cc8d3fd628b41d0b24a8b056da311d4357 Mon Sep 17 00:00:00 2001 From: liukangcc Date: Mon, 15 Nov 2021 13:43:33 +0800 Subject: [PATCH] [update] ignore_format.yml --- bsp/stm32/libraries/.ignore_format.yml | 1 + bsp/stm32/libraries/HAL_Drivers/drv_dma.h | 2 +- bsp/stm32/libraries/HAL_Drivers/drv_usart.c | 4 ++-- bsp/stm32/stm32u575-st-nucleo/rtconfig.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bsp/stm32/libraries/.ignore_format.yml b/bsp/stm32/libraries/.ignore_format.yml index cf41e85f04..549353ca06 100644 --- a/bsp/stm32/libraries/.ignore_format.yml +++ b/bsp/stm32/libraries/.ignore_format.yml @@ -17,5 +17,6 @@ dir_path: - STM32L4xx_HAL - STM32L5xx_HAL - STM32MPxx_HAL +- STM32U5xx_HAL - STM32WBxx_HAL - STM32WLxx_HAL diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_dma.h b/bsp/stm32/libraries/HAL_Drivers/drv_dma.h index 74799be54b..1d00fb0bf2 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_dma.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_dma.h @@ -25,7 +25,7 @@ extern "C" { || defined(SOC_SERIES_STM32U5) #define DMA_INSTANCE_TYPE DMA_Channel_TypeDef #elif defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7)\ - || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32MP1) + || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32MP1) #define DMA_INSTANCE_TYPE DMA_Stream_TypeDef #endif /* defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32WL) */ diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_usart.c b/bsp/stm32/libraries/HAL_Drivers/drv_usart.c index 2edd358f3b..7807e0c010 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_usart.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_usart.c @@ -971,11 +971,11 @@ static void stm32_dma_config(struct rt_serial_device *serial, rt_ubase_t flag) #if defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32L0)|| defined(SOC_SERIES_STM32F3) || defined(SOC_SERIES_STM32L1) || defined(SOC_SERIES_STM32U5) DMA_Handle->Instance = dma_config->Instance; -#elif defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) +#elif defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) DMA_Handle->Instance = dma_config->Instance; DMA_Handle->Init.Channel = dma_config->channel; #elif defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32WL) || defined(SOC_SERIES_STM32G0) || defined(SOC_SERIES_STM32G4) || defined(SOC_SERIES_STM32WB)\ - || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32MP1) + || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32MP1) DMA_Handle->Instance = dma_config->Instance; DMA_Handle->Init.Request = dma_config->request; #endif diff --git a/bsp/stm32/stm32u575-st-nucleo/rtconfig.py b/bsp/stm32/stm32u575-st-nucleo/rtconfig.py index 0b50b754df..e402f5a8bc 100644 --- a/bsp/stm32/stm32u575-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32u575-st-nucleo/rtconfig.py @@ -27,7 +27,7 @@ elif CROSS_TOOL == 'iar': if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') -EXEC_PATH = r'D:\\software\\tools\\gcc-arm-none-eabi-10.3-2021.07-win32\\gcc-arm-none-eabi-10.3-2021.07\\bin' + BUILD = 'debug' if PLATFORM == 'gcc':