Merge pull request #4677 from mysterywolf/stm32f407_3

[bsp][stm32f407-explorer] 避免COM2与以太网或PWM冲突,调整Kconfig文件
2021-05-13 12:23:31 +08:00 · 2021-05-13 12:23:31 +08:00 · e58ea3ded4
parent eca044f87c 119c04d0f2
commit e58ea3ded4
3 changed files with 2 additions and 1 deletions
--- 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
--- 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 <board.h>

 #ifdef BSP_USING_SRAM
-#include <sram_port.h>
+#include "drv_sram.h"

 #define DRV_DEBUG
 #define LOG_TAG             "drv.sram"
--- a/bsp/stm32/stm32f407-atk-explorer/board/ports/sram_port.h
+++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/sram_port.h