diff options
| author | Bernard Xiong <[email protected]> | 2021-05-13 12:23:31 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-13 12:23:31 +0800 |
| commit | e58ea3ded4302bd2abad84a803f12f14e0990109 (patch) | |
| tree | 0aa2d4b2dc63a9b717aefaf083dc7ca746185e81 | |
| parent | eca044f87c629c2df08dfc66cea399c6be9b102f (diff) | |
| parent | 119c04d0f25136a8f395082fc4e46c5c56b2fabe (diff) | |
Merge pull request #4677 from mysterywolf/stm32f407_3
[bsp][stm32f407-explorer] 避免COM2与以太网或PWM冲突,调整Kconfig文件
| -rw-r--r-- | bsp/stm32/stm32f407-atk-explorer/board/Kconfig | 1 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-atk-explorer/board/ports/drv_sram.c | 2 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-atk-explorer/board/ports/drv_sram.h (renamed from bsp/stm32/stm32f407-atk-explorer/board/ports/sram_port.h) | 0 |
3 files changed, 2 insertions, 1 deletions
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 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 <board.h> #ifdef BSP_USING_SRAM -#include <sram_port.h> +#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 index 6238e611b1..6238e611b1 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/ports/sram_port.h +++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_sram.h |