[ci][stm32f407] add attach config CI check

RT-Thread · Dec 26, 2023 · b12b8e9 · b12b8e9
1 parent 0b8fbee
commit b12b8e9
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 49 deletions.
diff --git a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.c b/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"
 

diff --git a/bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/eeprom.attach b/bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/eeprom.attach
@@ -0,0 +1 @@
+CONFIG_BSP_USING_EEPROM=y
diff --git a/bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/esp8266.attach b/bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/esp8266.attach
@@ -0,0 +1 @@
+CONFIG_BSP_USING_AT_ESP8266=y
diff --git a/bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/ethernet.attach b/bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/ethernet.attach
@@ -0,0 +1 @@
+CONFIG_BSP_USING_ETH=y
diff --git a/bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/lvgl.attach b/bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/lvgl.attach
@@ -0,0 +1,2 @@
+CONFIG_BSP_USING_LVGL=y
+CONFIG_BSP_USING_LVGL_DEMO=y
diff --git a/bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/sdcard.attach b/bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/sdcard.attach
@@ -0,0 +1,2 @@
+CONFIG_BSP_USING_FS=y
+BSP_USING_SDCARD_FATFS=y
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig b/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

diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_lcd.c b/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"

diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c b/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)
 

diff --git a/components/dfs/Kconfig b/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

diff --git a/components/dfs/dfs_v1/filesystems/romfs/SConscript b/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')
diff --git a/components/dfs/dfs_v1/filesystems/romfs/dfs_romfs.c b/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
diff --git a/components/dfs/dfs_v1/filesystems/romfs/dfs_romfs.h b/components/dfs/dfs_v1/filesystems/romfs/dfs_romfs.h
@@ -26,6 +26,9 @@ struct romfs_dirent
 };
 
 int dfs_romfs_init(void);
+
+#ifndef RT_USING_DFS_ROMFS_USER_ROOT
 extern const struct romfs_dirent romfs_root;
+#endif /* RT_USING_DFS_ROMFS_USER_ROOT */
 
-#endif
+#endif /* __DFS_ROMFS_H__ */
diff --git a/components/dfs/dfs_v1/filesystems/romfs/romfs.c b/components/dfs/dfs_v1/filesystems/romfs/romfs.c
diff --git a/components/dfs/dfs_v2/filesystems/romfs/SConscript b/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')
diff --git a/tools/ci/bsp_buildings.py b/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