Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ci][stm32f407] add attach config CI check #8425

Merged
merged 1 commit into from
Dec 26, 2023
Merged

[ci][stm32f407] add attach config CI check #8425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/eeprom.attach
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_BSP_USING_EEPROM=y
1 change: 1 addition & 0 deletions bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/esp8266.attach
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_BSP_USING_AT_ESP8266=y
1 change: 1 addition & 0 deletions bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/ethernet.attach
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_BSP_USING_ETH=y
2 changes: 2 additions & 0 deletions bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/lvgl.attach
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BSP_USING_LVGL=y
CONFIG_BSP_USING_LVGL_DEMO=y
2 changes: 2 additions & 0 deletions bsp/stm32/stm32f407-atk-explorer/.ci/attachconfig/sdcard.attach
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BSP_USING_FS=y
BSP_USING_SDCARD_FATFS=y
1 change: 1 addition & 0 deletions bsp/stm32/stm32f407-atk-explorer/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion bsp/stm32/stm32f407-atk-explorer/board/ports/drv_lcd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/

#include <board.h>
#include <drv_gpio.h>

#define RESET_IO GET_PIN(D, 3)

Expand Down
5 changes: 5 additions & 0 deletions components/dfs/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions components/dfs/dfs_v1/filesystems/romfs/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
mysterywolf marked this conversation as resolved.
Show resolved Hide resolved

group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH)

Return('group')
27 changes: 27 additions & 0 deletions components/dfs/dfs_v1/filesystems/romfs/dfs_romfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion components/dfs/dfs_v1/filesystems/romfs/dfs_romfs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
38 changes: 0 additions & 38 deletions components/dfs/dfs_v1/filesystems/romfs/romfs.c
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions components/dfs/dfs_v2/filesystems/romfs/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
2 changes: 1 addition & 1 deletion tools/ci/bsp_buildings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading