From dc55b1e19c8b505192dd3e74ed39b9fdf9f63fd3 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Mon, 10 May 2021 16:49:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[bsp][stm32f407-explorer]=20=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8Dsram=5Fport.h=E4=B8=BAdrv=5Fsram.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/stm32/stm32f407-atk-explorer/board/ports/drv_sram.c | 2 +- .../board/ports/{sram_port.h => drv_sram.h} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename bsp/stm32/stm32f407-atk-explorer/board/ports/{sram_port.h => drv_sram.h} (100%) diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_sram.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_sram.c index dba9ec5e29..c947c759f2 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_sram.c +++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_sram.c @@ -13,7 +13,7 @@ #include #ifdef BSP_USING_SRAM -#include +#include "drv_sram.h" #define DRV_DEBUG #define LOG_TAG "drv.sram" diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/sram_port.h b/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_sram.h similarity index 100% rename from bsp/stm32/stm32f407-atk-explorer/board/ports/sram_port.h rename to bsp/stm32/stm32f407-atk-explorer/board/ports/drv_sram.h From 119c04d0f25136a8f395082fc4e46c5c56b2fabe Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Mon, 10 May 2021 20:20:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Kconfig]=20=E9=81=BF=E5=85=8DCOM2=E4=B8=8E?= =?UTF-8?q?=E4=BB=A5=E5=A4=AA=E7=BD=91=E6=88=96PWM=E5=86=B2=E7=AA=81=20?= =?UTF-8?q?=E5=9B=A0=E6=AD=A4=E5=A2=9E=E5=8A=A0depends=20on=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=EF=BC=8C=E5=9C=A8=E5=BC=80=E5=90=AF=E4=BB=A5=E5=A4=AA?= =?UTF-8?q?=E7=BD=91=E6=88=96=E8=80=85PWM=E9=A9=B1=E5=8A=A8=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=98=BE=E7=A4=BACOM2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/stm32/stm32f407-atk-explorer/board/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig index 84aa84e42c..f411904234 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig +++ b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig @@ -17,6 +17,7 @@ menu "Onboard Peripheral Drivers" config BSP_USING_COM2 bool "Enable COM2 (uart2 pin conflict with Ethernet and PWM)" + depends on (!BSP_USING_ETH && !BSP_USING_PWM) select BSP_USING_UART select BSP_USING_UART2 default n