[ci][stm32f407] add attach config CI check

bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.c

@@ -8,6 +8,7 @@
  * 2022-6-14      solar        first version
  */
 #include <board.h>
+#include <string.h>
 #include "drv_soft_spi.h"
 #include "drv_config.h"
 

bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/eeprom.attach

@@ -0,0 +1 @@
+CONFIG_BSP_USING_EEPROM=y

bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/esp8266.attach

@@ -0,0 +1 @@
+CONFIG_BSP_USING_AT_ESP8266=y

bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/ethernet.attach

@@ -0,0 +1 @@
+CONFIG_BSP_USING_ETH=y

bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/lvgl.attach

@@ -0,0 +1,2 @@
+CONFIG_BSP_USING_LVGL=y
+CONFIG_BSP_USING_LVGL_DEMO=y

bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/sdcard.attach

@@ -0,0 +1,2 @@
+CONFIG_BSP_USING_FS=y
+BSP_USING_SDCARD_FATFS=y

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

@@ -127,6 +127,7 @@ menu "Onboard Peripheral Drivers"
         bool "Enable File System"
         select RT_USING_DFS
         select RT_USING_DFS_ROMFS
+        select RT_USING_DFS_ROMFS_USER_ROOT
         default n
 
         if BSP_USING_FS

bsp/stm32/stm32f407-atk-explorer/board/ports/drv_lcd.c

@@ -12,7 +12,8 @@
 
 #include <board.h>
 #include "drv_lcd.h"
-#include "string.h"
+#include <drv_gpio.h>
+#include <string.h>
 
 //#define DRV_DEBUG
 #define LOG_TAG "drv.lcd"

bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c

@@ -9,6 +9,7 @@
  */
 
 #include <board.h>
+#include <drv_gpio.h>
 
 #define RESET_IO GET_PIN(D, 3)
 

components/dfs/Kconfig

@@ -165,6 +165,11 @@ endif
         bool "Enable ReadOnly file system on flash"
         default n
 
+    config RT_USING_DFS_ROMFS_USER_ROOT
+        bool "Use user's romfs root"
+        depends on RT_USING_DFS_ROMFS
+        default n
+
     config RT_USING_DFS_CROMFS
         bool "Enable ReadOnly compressed file system on flash"
         default n

components/dfs/dfs_v1/filesystems/romfs/SConscript

@@ -6,10 +6,6 @@ cwd = GetCurrentDir()
 src = Glob('*.c')
 CPPPATH = [cwd]
 
-if GetDepend('DFS_ROMFS_ROOT'):
-    # A new ROMFS root has been defined, we should remove the romfs.c
-    SrcRemove(src, ['romfs.c'])
-
 group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH)
 
 Return('group')

components/dfs/dfs_v1/filesystems/romfs/dfs_romfs.c

@@ -382,3 +382,30 @@ int dfs_romfs_init(void)
 }
 INIT_COMPONENT_EXPORT(dfs_romfs_init);
 
+#ifndef RT_USING_DFS_ROMFS_USER_ROOT
+static const unsigned char _dummy_dummy_txt[] =
+{
+    0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x21, 0x0d, 0x0a,
+};
+
+static const struct romfs_dirent _dummy[] =
+{
+    {ROMFS_DIRENT_FILE, "dummy.txt", _dummy_dummy_txt, sizeof(_dummy_dummy_txt)},
+};
+
+static const unsigned char _dummy_txt[] =
+{
+    0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x21, 0x0d, 0x0a,
+};
+
+rt_weak const struct romfs_dirent _root_dirent[] =
+{
+    {ROMFS_DIRENT_DIR, "dummy", (rt_uint8_t *)_dummy, sizeof(_dummy) / sizeof(_dummy[0])},
+    {ROMFS_DIRENT_FILE, "dummy.txt", _dummy_txt, sizeof(_dummy_txt)},
+};
+
+rt_weak const struct romfs_dirent romfs_root =
+{
+    ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_root_dirent, sizeof(_root_dirent) / sizeof(_root_dirent[0])
+};
+#endif

components/dfs/dfs_v1/filesystems/romfs/dfs_romfs.h

@@ -26,6 +26,9 @@ struct romfs_dirent
 };
 
 int dfs_romfs_init(void);
-extern const struct romfs_dirent romfs_root;
 
-#endif
+#ifndef RT_USING_DFS_ROMFS_USER_ROOT
+extern const struct romfs_dirent romfs_root;
+#endif /* RT_USING_DFS_ROMFS_USER_ROOT */
+
+#endif /* __DFS_ROMFS_H__ */

components/dfs/dfs_v1/filesystems/romfs/romfs.c

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2022, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- */
-
-#include <rtthread.h>
-#include <dfs_romfs.h>
-
-static const unsigned char _dummy_dummy_txt[] =
-{
-    0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x21, 0x0d, 0x0a,
-};
-
-static const struct romfs_dirent _dummy[] =
-{
-    {ROMFS_DIRENT_FILE, "dummy.txt", _dummy_dummy_txt, sizeof(_dummy_dummy_txt)},
-};
-
-static const unsigned char _dummy_txt[] =
-{
-    0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x21, 0x0d, 0x0a,
-};
-
-rt_weak const struct romfs_dirent _root_dirent[] =
-{
-    {ROMFS_DIRENT_DIR, "dummy", (rt_uint8_t *)_dummy, sizeof(_dummy) / sizeof(_dummy[0])},
-    {ROMFS_DIRENT_FILE, "dummy.txt", _dummy_txt, sizeof(_dummy_txt)},
-};
-
-rt_weak const struct romfs_dirent romfs_root =
-{
-    ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_root_dirent, sizeof(_root_dirent) / sizeof(_root_dirent[0])
-};
-

components/dfs/dfs_v2/filesystems/romfs/SConscript

@@ -6,10 +6,6 @@ cwd = GetCurrentDir()
 src = Glob('*.c')
 CPPPATH = [cwd]
 
-if GetDepend('DFS_ROMFS_ROOT'):
-    # A new ROMFS root has been defined, we should remove the romfs.c
-    SrcRemove(src, ['romfs.c'])
-
 group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH)
 
 Return('group')

tools/ci/bsp_buildings.py

@@ -67,7 +67,7 @@ def build_bsp(bsp):
 
         nproc = multiprocessing.cpu_count()
         os.chdir(rtt_root)
-        __, res = run_cmd(f'scons -C bsp/{bsp} -j{nproc}')
+        __, res = run_cmd(f'scons -C bsp/{bsp} -j{nproc}', output_info=False)
 
         if res != 0:
             success = False