From b1fae3a6041536be9a93c8a6c190177569a9fbe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E5=9F=BA=E7=B1=B3=E4=B8=9C?= Date: Fri, 22 Sep 2023 19:04:28 +0800 Subject: [PATCH] [bsp][mchp] fix samc21, same54, same70, saml10 build errors --- bsp/microchip/common/applications/adc_demo.c | 2 +- bsp/microchip/common/applications/adc_demo.h | 2 +- bsp/microchip/common/applications/can_demo.c | 2 +- bsp/microchip/common/applications/can_demo.h | 2 +- bsp/microchip/common/applications/i2c_demo.c | 2 +- bsp/microchip/common/applications/i2c_demo.h | 2 +- bsp/microchip/common/applications/lwip_demo.c | 2 +- bsp/microchip/common/applications/lwip_demo.h | 2 +- bsp/microchip/common/board/sam_gmac.c | 2 +- bsp/microchip/common/board/sam_gmac.h | 2 +- bsp/microchip/common/board/sam_i2c.c | 2 +- bsp/microchip/common/board/sam_i2c.h | 2 +- bsp/microchip/common/board/serial.c | 6 +++--- bsp/microchip/common/board/serial.h | 2 +- bsp/microchip/samc21/applications/main.c | 2 +- bsp/microchip/samc21/board/board.c | 2 +- bsp/microchip/samc21/board/board.h | 12 +++++++++--- bsp/microchip/same54/applications/main.c | 2 +- bsp/microchip/same54/board/board.c | 2 +- bsp/microchip/same54/board/board.h | 12 +++++++++--- bsp/microchip/same70/applications/main.c | 2 +- bsp/microchip/same70/board/board.c | 2 +- bsp/microchip/same70/board/board.h | 12 +++++++++--- bsp/microchip/saml10/applications/main.c | 2 +- bsp/microchip/saml10/board/board.c | 2 +- bsp/microchip/saml10/board/board.h | 12 +++++++++--- 26 files changed, 60 insertions(+), 36 deletions(-) diff --git a/bsp/microchip/common/applications/adc_demo.c b/bsp/microchip/common/applications/adc_demo.c index 156c31088f..0a85b566fa 100644 --- a/bsp/microchip/common/applications/adc_demo.c +++ b/bsp/microchip/common/applications/adc_demo.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/applications/adc_demo.h b/bsp/microchip/common/applications/adc_demo.h index 5819343be8..614a766108 100644 --- a/bsp/microchip/common/applications/adc_demo.h +++ b/bsp/microchip/common/applications/adc_demo.h @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/applications/can_demo.c b/bsp/microchip/common/applications/can_demo.c index b35faebae2..bc576f0dd7 100644 --- a/bsp/microchip/common/applications/can_demo.c +++ b/bsp/microchip/common/applications/can_demo.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/applications/can_demo.h b/bsp/microchip/common/applications/can_demo.h index 499d0390f8..6aa65c365c 100644 --- a/bsp/microchip/common/applications/can_demo.h +++ b/bsp/microchip/common/applications/can_demo.h @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/applications/i2c_demo.c b/bsp/microchip/common/applications/i2c_demo.c index 6e6d132286..afc7d47b86 100644 --- a/bsp/microchip/common/applications/i2c_demo.c +++ b/bsp/microchip/common/applications/i2c_demo.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/applications/i2c_demo.h b/bsp/microchip/common/applications/i2c_demo.h index 7fc4b4af6e..5022693e6c 100644 --- a/bsp/microchip/common/applications/i2c_demo.h +++ b/bsp/microchip/common/applications/i2c_demo.h @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/applications/lwip_demo.c b/bsp/microchip/common/applications/lwip_demo.c index 697f580249..941bd94f96 100644 --- a/bsp/microchip/common/applications/lwip_demo.c +++ b/bsp/microchip/common/applications/lwip_demo.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2022, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/applications/lwip_demo.h b/bsp/microchip/common/applications/lwip_demo.h index 9c2abd3989..e96404ff5e 100644 --- a/bsp/microchip/common/applications/lwip_demo.h +++ b/bsp/microchip/common/applications/lwip_demo.h @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/board/sam_gmac.c b/bsp/microchip/common/board/sam_gmac.c index 12d745f655..02dd6c219d 100644 --- a/bsp/microchip/common/board/sam_gmac.c +++ b/bsp/microchip/common/board/sam_gmac.c @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/board/sam_gmac.h b/bsp/microchip/common/board/sam_gmac.h index 6c4d90658a..2da6fee0fb 100644 --- a/bsp/microchip/common/board/sam_gmac.h +++ b/bsp/microchip/common/board/sam_gmac.h @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/board/sam_i2c.c b/bsp/microchip/common/board/sam_i2c.c index 671b16b5a2..52e6392d10 100644 --- a/bsp/microchip/common/board/sam_i2c.c +++ b/bsp/microchip/common/board/sam_i2c.c @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/board/sam_i2c.h b/bsp/microchip/common/board/sam_i2c.h index 5ea3149ced..6200893af8 100644 --- a/bsp/microchip/common/board/sam_i2c.h +++ b/bsp/microchip/common/board/sam_i2c.h @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/common/board/serial.c b/bsp/microchip/common/board/serial.c index 1f25b21a88..793d119864 100644 --- a/bsp/microchip/common/board/serial.c +++ b/bsp/microchip/common/board/serial.c @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -241,8 +241,8 @@ int rt_hw_uart_init(void) sam_serial.ops = &sam_serial_ops; sam_serial.config = config; - // sam_serial.serial_rx = RT_NULL; - // sam_serial.serial_tx = RT_NULL; + sam_serial.serial_rx = RT_NULL; + sam_serial.serial_tx = RT_NULL; rt_hw_serial_register(&sam_serial, "uart0" /* RT_CONSOLE_DEVICE_NAME */, RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_INT_TX, (void *)&TARGET_IO); diff --git a/bsp/microchip/common/board/serial.h b/bsp/microchip/common/board/serial.h index 12e6811231..95e7d65241 100644 --- a/bsp/microchip/common/board/serial.h +++ b/bsp/microchip/common/board/serial.h @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/samc21/applications/main.c b/bsp/microchip/samc21/applications/main.c index e055ad0ab1..01798b3c95 100644 --- a/bsp/microchip/samc21/applications/main.c +++ b/bsp/microchip/samc21/applications/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/samc21/board/board.c b/bsp/microchip/samc21/board/board.c index e16a5357da..5a34c42661 100644 --- a/bsp/microchip/samc21/board/board.c +++ b/bsp/microchip/samc21/board/board.c @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/samc21/board/board.h b/bsp/microchip/samc21/board/board.h index 5451d04296..cadbe20e31 100644 --- a/bsp/microchip/samc21/board/board.h +++ b/bsp/microchip/samc21/board/board.h @@ -1,11 +1,12 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * * Change Logs: - * Date Author Email Notes - * 2019-07-16 Kevin.Liu kevin.liu.mchp@gmail.com First Release + * Date Author Email Notes + * 2019-07-16 Kevin.Liu kevin.liu.mchp@gmail.com First Release + * 2023-09-16 luhuadong luhuadong@163.com fix uart config */ #ifndef __BOARD_H__ #define __BOARD_H__ @@ -59,6 +60,11 @@ extern int __bss_end; #define HEAP_END SAMC21_SRAM_END #endif +#ifdef RT_USING_SERIAL +#include "hpl_sercom_config.h" +#define DEFAULT_USART_BAUD_RATE CONF_SERCOM_4_USART_BAUD +#endif + void rt_hw_board_init(void); #endif diff --git a/bsp/microchip/same54/applications/main.c b/bsp/microchip/same54/applications/main.c index d08200f628..5aa48670e8 100644 --- a/bsp/microchip/same54/applications/main.c +++ b/bsp/microchip/same54/applications/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/same54/board/board.c b/bsp/microchip/same54/board/board.c index 4144d0255f..b42e8912f3 100644 --- a/bsp/microchip/same54/board/board.c +++ b/bsp/microchip/same54/board/board.c @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/same54/board/board.h b/bsp/microchip/same54/board/board.h index fd504669b0..75cafac484 100644 --- a/bsp/microchip/same54/board/board.h +++ b/bsp/microchip/same54/board/board.h @@ -1,11 +1,12 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * * Change Logs: - * Date Author Email Notes - * 2019-07-16 Kevin.Liu kevin.liu.mchp@gmail.com First Release + * Date Author Email Notes + * 2019-07-16 Kevin.Liu kevin.liu.mchp@gmail.com First Release + * 2023-09-16 luhuadong luhuadong@163.com fix uart config */ #ifndef __BOARD_H__ #define __BOARD_H__ @@ -73,6 +74,11 @@ extern int __bss_end; #define HEAP_END SAME5x_SRAM_END #endif +#ifdef RT_USING_SERIAL +#include "hpl_sercom_config.h" +#define DEFAULT_USART_BAUD_RATE CONF_SERCOM_2_USART_BAUD +#endif + void rt_hw_board_init(void); #endif diff --git a/bsp/microchip/same70/applications/main.c b/bsp/microchip/same70/applications/main.c index d08200f628..5aa48670e8 100644 --- a/bsp/microchip/same70/applications/main.c +++ b/bsp/microchip/same70/applications/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/same70/board/board.c b/bsp/microchip/same70/board/board.c index 4cb47179ba..642d91660f 100644 --- a/bsp/microchip/same70/board/board.c +++ b/bsp/microchip/same70/board/board.c @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/same70/board/board.h b/bsp/microchip/same70/board/board.h index 0b32541180..5d4fe60477 100644 --- a/bsp/microchip/same70/board/board.h +++ b/bsp/microchip/same70/board/board.h @@ -1,11 +1,12 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * * Change Logs: - * Date Author Email Notes - * 2019-07-16 Kevin.Liu kevin.liu.mchp@gmail.com First Release + * Date Author Email Notes + * 2019-07-16 Kevin.Liu kevin.liu.mchp@gmail.com First Release + * 2023-09-16 luhuadong luhuadong@163.com fix uart config */ #ifndef __BOARD_H__ #define __BOARD_H__ @@ -105,6 +106,11 @@ extern int __bss_end; #define HEAP_END SAME70_SRAM_END #endif +#ifdef RT_USING_SERIAL +#include "hpl_usart_config.h" +#define DEFAULT_USART_BAUD_RATE CONF_USART_1_BAUD +#endif + void rt_hw_board_init(void); #endif diff --git a/bsp/microchip/saml10/applications/main.c b/bsp/microchip/saml10/applications/main.c index e83a6ba307..72ef776bd1 100644 --- a/bsp/microchip/saml10/applications/main.c +++ b/bsp/microchip/saml10/applications/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/saml10/board/board.c b/bsp/microchip/saml10/board/board.c index e16a5357da..5a34c42661 100644 --- a/bsp/microchip/saml10/board/board.c +++ b/bsp/microchip/saml10/board/board.c @@ -1,5 +1,5 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/microchip/saml10/board/board.h b/bsp/microchip/saml10/board/board.h index a0454e18b5..3031662482 100644 --- a/bsp/microchip/saml10/board/board.h +++ b/bsp/microchip/saml10/board/board.h @@ -1,11 +1,12 @@ /* - * Copyright (c) + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * * Change Logs: - * Date Author Email Notes - * 2022-04-16 Kevin.Liu kevin.liu.mchp@gmail.com First Release + * Date Author Email Notes + * 2019-07-16 Kevin.Liu kevin.liu.mchp@gmail.com First Release + * 2023-09-16 luhuadong luhuadong@163.com fix uart config */ #ifndef __BOARD_H__ #define __BOARD_H__ @@ -43,6 +44,11 @@ extern int __bss_end; #define HEAP_END SAML10_SRAM_END #endif +#ifdef RT_USING_SERIAL +#include "hpl_sercom_config.h" +#define DEFAULT_USART_BAUD_RATE CONF_SERCOM_2_USART_BAUD +#endif + void rt_hw_board_init(void); #endif