Merge branch 'fudfe' into gitee_master

2021-04-08 21:19:30 +08:00 · 2021-04-08 21:19:30 +08:00 · 7355e4b6f3
parent 3d3752e52b a8fb6109e0
commit 7355e4b6f3
2 changed files with 3 additions and 1 deletions
--- a/bsp/stm32/libraries/HAL_Drivers/drv_common.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_common.c
@ -168,7 +168,7 @@ RT_WEAK void rt_hw_board_init()
 #endif

    /* Set the shell console output device */
-#ifdef RT_USING_CONSOLE
+#if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE)
    rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif

--- a/bsp/stm32/libraries/HAL_Drivers/drv_common.h
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_common.h
@ -13,7 +13,9 @@

 #include <rtthread.h>
 #include <rthw.h>
+#ifdef RT_USING_DEVICE
 #include <rtdevice.h>
+#endif

 #ifdef __cplusplus
 extern "C" {