bsp: Separate STM32F4 HAL drivers -2

Author: fengmuyou

bsp/stm32/stm32f401-st-nucleo/SConstruct

@@ -50,7 +50,6 @@ rtconfig.BSP_LIBRARY_TYPE = None
 # include drivers
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),variant_dir='build/libraries/HAL_Drivers', duplicate=0))
 
-#objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/stm32f401-weact-blackpill/SConstruct

@@ -50,7 +50,6 @@ rtconfig.BSP_LIBRARY_TYPE = None
 # include drivers
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),variant_dir='build/libraries/'+'HAL_Drivers', duplicate=0))
 
-#objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/stm32f405-smdz-breadfruit/SConstruct

@@ -50,7 +50,6 @@ rtconfig.BSP_LIBRARY_TYPE = None
 # include drivers
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),variant_dir='build/libraries/'+'HAL_Drivers', duplicate=0))
 
-#objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/stm32f405zg-mini-template/SConstruct

@@ -50,7 +50,6 @@ rtconfig.BSP_LIBRARY_TYPE = None
 # include drivers
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),variant_dir='build/libraries/'+'HAL_Drivers', duplicate=0))
 
-#objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/stm32f407-atk-explorer/SConstruct

@@ -50,7 +50,6 @@ rtconfig.BSP_LIBRARY_TYPE = None
 # include drivers
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),variant_dir='build/libraries/HAL_Drivers', duplicate=0))
 
-objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/stm32f407-atk-explorer/board/CubeMX_Config/Inc/stm32f4xx_hal_conf.h

@@ -45,7 +45,8 @@
 #define HAL_DAC_MODULE_ENABLED
 /* #define HAL_DCMI_MODULE_ENABLED   */
 /* #define HAL_DMA2D_MODULE_ENABLED   */
-#define HAL_ETH_MODULE_ENABLED
+/* #define HAL_ETH_MODULE_ENABLED    */
+#define HAL_ETH_LEGACY_MODULE_ENABLED
 /* #define HAL_NAND_MODULE_ENABLED   */
 /* #define HAL_NOR_MODULE_ENABLED   */
 /* #define HAL_PCCARD_MODULE_ENABLED   */
@@ -327,6 +328,10 @@
   #include "stm32f4xx_hal_eth.h"
 #endif /* HAL_ETH_MODULE_ENABLED */
 
+#ifdef HAL_ETH_LEGACY_MODULE_ENABLED
+  #include "stm32f4xx_hal_eth_legacy.h"
+#endif /* HAL_ETH_LEGACY_MODULE_ENABLED */
+
 #ifdef HAL_FLASH_MODULE_ENABLED
   #include "stm32f4xx_hal_flash.h"
 #endif /* HAL_FLASH_MODULE_ENABLED */

bsp/stm32/stm32f407-atk-explorer/board/Kconfig

@@ -104,13 +104,18 @@ menu "Onboard Peripheral Drivers"
         select BSP_USING_I2C1
         default n
 
+    config BSP_ETH_LEGACY_MODULE_ENABLED
+    bool
+    default n
+
     config BSP_USING_ETH
         bool "Enable Ethernet"
         default n
         select RT_USING_LWIP
         select RT_LWIP_USING_HW_CHECKSUM
         select RT_USING_POSIX_FS
         select RT_USING_POSIX_SOCKET
+        select BSP_ETH_LEGACY_MODULE_ENABLED
 
     config PHY_USING_LAN8720A
         bool
@@ -122,6 +127,16 @@ menu "Onboard Peripheral Drivers"
         default n
         select BSP_USING_I2C1
         select PKG_USING_MPU6XXX
+    
+    menuconfig BSP_USING_CAN
+        bool "Enable On Board CAN"
+        select RT_USING_CAN
+        default n
+        if BSP_USING_CAN
+            config BSP_USING_CAN1
+            bool "Enable On Board CAN1"
+            default n
+        endif    
 
     menuconfig BSP_USING_FS
         bool "Enable File System"

bsp/stm32/stm32f407-atk-explorer/board/ports/SConscript

@@ -8,19 +8,21 @@ cwd  = GetCurrentDir()
 src = []
 path =  [cwd]
 
-if GetDepend(['BSP_USING_FAL']):
-    src += Glob('fal/fal_spi_flash_sfud_port.c')
-    path += [cwd + '/fal']
+if GetDepend(['BSP_USING_FS']):
+    src += Glob('drv_filesystem.c')
+    if GetDepend(['BSP_USING_SPI_FLASH_LITTLEFS']):
+        src += Glob('fal/fal_spi_flash_sfud_port.c')
+        path += [cwd + '/fal']
 
-if GetDepend(['BSP_USING_TOUCH']):
+if GetDepend(['BSP_USING_TOUCH_CAP']):
     src += Glob('touch/drv_touch_ft.c')
-    src += Glob('touch/drv_touch_xpt.c')
     src += Glob('touch/drv_touch.c')
-    src += Glob('touch/drv_xpt2046_init.c')
     path += [cwd + '/touch']
 
-if GetDepend(['BSP_USING_FS']):
-    src += Glob('drv_filesystem.c')
+if GetDepend(['BSP_USING_TOUCH_RES']):
+    src += Glob('touch/drv_touch_xpt.c')
+    src += Glob('touch/drv_xpt2046_init.c')
+    path += [cwd + '/touch']
 
 if GetDepend(['BSP_USING_ONBOARD_LCD']):
     src += Glob('drv_lcd.c')

bsp/stm32/stm32f407-rt-spark/SConstruct

@@ -50,7 +50,5 @@ rtconfig.BSP_LIBRARY_TYPE = None
 # include drivers
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),variant_dir='build/libraries/HAL_Drivers', duplicate=0))
 
-objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')))
-
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/stm32f407-rt-spark/board/ports/lvgl/lv_port_disp.c

@@ -26,7 +26,7 @@
     #define MY_DISP_VER_RES    240
 #endif
 
-#if (PKG_LVGL_VER_NUM >= 0x090000)
+#if (PKG_LVGL_VER_NUM >= 0x0803FF)
     #define LV_DISP_TYPE    lv_display_t
     #define lv_COLOR_TYPE   uint8_t
 #else
@@ -101,7 +101,7 @@ void lv_port_disp_init(void)
      * Register the display in LVGL
      *----------------------------------*/
 
-#if (PKG_LVGL_VER_NUM >= 0x090000)
+#if (PKG_LVGL_VER_NUM >= 0x0803FF)
 
     lv_display_t *display = lv_display_create(MY_DISP_HOR_RES, MY_DISP_VER_RES);
     lv_display_set_buffers(display, buf_1, NULL, sizeof(buf_1), LV_DISPLAY_RENDER_MODE_PARTIAL);  /*Initialize the display buffer.*/