Skip to content

[bsp][qemu-virt64] Restore standard kernel defaults #11942

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

Merged
Rbb666 merged 1 commit into from
Oct 29, 2026
Merged

[bsp][qemu-virt64] Restore standard kernel defaults #11942

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
12 changes: 3 additions & 9 deletions .github/ALL_BSP_COMPILE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@
"RTT_BSP": "aarch64",
"RTT_TOOL_CHAIN": "sourcery-aarch64",
"SUB_RTT_BSP": [
"qemu-virt64-aarch64",
"raspberry-pi/raspi3-64",
"raspberry-pi/raspi4-64",
"nxp/imx/imx91",
Expand All @@ -418,8 +419,7 @@
"RTT_TOOL_CHAIN": "sourcery-aarch64",
"RTT_SMART_TOOL_CHAIN": "aarch64-linux-musleabi",
"SUB_RTT_BSP": [
"rockchip/rk3500",
"qemu-virt64-aarch64"
"rockchip/rk3500"
]
},
{
Expand All @@ -439,16 +439,10 @@
"RTT_TOOL_CHAIN": "sourcery-riscv64-unknown-elf",
"SUB_RTT_BSP": [
"bluetrum/ab32vg1-ab-prougen",
"qemu-virt64-riscv",
"ultrarisc/ur_dp1000_evb"
]
},
{
"RTT_BSP": "qemu-smart",
"RTT_TOOL_CHAIN": "sourcery-riscv64-general-toolchain",
"SUB_RTT_BSP": [
"qemu-virt64-riscv"
]
},
{
"RTT_BSP": "K230",
"RTT_TOOL_CHAIN": "riscv64-unknown-linux-musl-",
Expand Down
3 changes: 1 addition & 2 deletions .github/membrowse-targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@
},
{
"target_name": "qemu-virt64-aarch64",
"toolchain": "aarch64-linux-musleabi",
"rtt_cc_prefix": "aarch64-linux-musleabi-",
"toolchain": "aarch64-none-elf",
"bsp_path": "bsp/qemu-virt64-aarch64",
"elf": "bsp/qemu-virt64-aarch64/rtthread.elf",
"ld": "libcpu/aarch64/link.lds",
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/utest_auto_run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,19 +278,21 @@ jobs:
# Whether plan to run SMP?
if [[ "${{ matrix.platform.SMP_RUN }}" == "smp" ]]; then
cat $UTEST_CONFIG_ROOT/smp/smp.cfg >> $TEST_BSP_ROOT/.config
echo >> $TEST_BSP_ROOT/.config
fi

# Is the kernel rtsmart?
if [[ "${{ matrix.platform.KERNEL }}" == "rtsmart" ]]; then
cat $UTEST_CONFIG_ROOT/rtsmart/rtsmart.cfg >> $TEST_BSP_ROOT/.config
echo >> $TEST_BSP_ROOT/.config
elif [[ "$TEST_BSP_ROOT" == "bsp/qemu-virt64-riscv" || "$TEST_BSP_ROOT" == "bsp/qemu-virt64-aarch64" ]]; then
# Standard kernel tests use the upstream non-SMART BSP configuration.
git fetch -q origin master
git checkout -q origin/master -- $TEST_BSP_ROOT/.config $TEST_BSP_ROOT/rtconfig.h
# Select the standard kernel without overwriting the SMP configuration.
echo "# CONFIG_RT_USING_SMART is not set" >> $TEST_BSP_ROOT/.config
fi

echo CONFIG_RT_USING_UTESTCASES=y >> $TEST_BSP_ROOT/.config
cat $UTEST_CONFIG_ROOT/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config
echo >> $TEST_BSP_ROOT/.config

# Keep standard qemu tests free of PM/tickless side effects.
if [[ "${{ matrix.platform.KERNEL }}" == "standard" && ( "$TEST_BSP_ROOT" == "bsp/qemu-virt64-riscv" || "$TEST_BSP_ROOT" == "bsp/qemu-virt64-aarch64" ) ]]; then
Expand Down
73 changes: 15 additions & 58 deletions bsp/qemu-virt64-aarch64/.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ CONFIG_RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS=4
CONFIG_RT_NAME_MAX=16
# CONFIG_RT_USING_ARCH_DATA_TYPE is not set
# CONFIG_RT_USING_NANO is not set
CONFIG_RT_USING_SMART=y
# CONFIG_RT_USING_SMART is not set
# CONFIG_RT_USING_AMP is not set
CONFIG_RT_USING_SMP=y
CONFIG_RT_CPUS_NR=4
Expand Down Expand Up @@ -199,7 +199,7 @@ CONFIG_RT_USING_CONSOLE=y
CONFIG_RT_CONSOLEBUF_SIZE=256
CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
CONFIG_RT_USING_CONSOLE_OUTPUT_CTL=y
CONFIG_RT_VER_NUM=0x50301
CONFIG_RT_VER_NUM=0x50400
CONFIG_RT_USING_STDC_ATOMIC=y
CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32
# end of RT-Thread Kernel
Expand All @@ -222,7 +222,6 @@ CONFIG_RT_USING_CPU_FFS=y
CONFIG_ARCH_MM_MMU=y
CONFIG_ARCH_ARM=y
CONFIG_ARCH_ARM_MMU=y
CONFIG_KERNEL_VADDR_START=0xffff000000000000
CONFIG_ARCH_ARMV8=y
CONFIG_ARCH_USING_ASID=y
CONFIG_ARCH_USING_HW_THREAD_SELF=y
Expand Down Expand Up @@ -262,6 +261,9 @@ CONFIG_RT_USING_DFS=y
CONFIG_DFS_USING_POSIX=y
CONFIG_DFS_USING_WORKDIR=y
CONFIG_DFS_FD_MAX=512
# CONFIG_RT_USING_DFS_V1 is not set
CONFIG_RT_USING_DFS_V2=y
CONFIG_RT_USING_DFS_ELMFAT=y

#
# elm-chan's FatFs, Generic FAT Filesystem Module
Expand All @@ -287,18 +289,11 @@ CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000
# CONFIG_RT_DFS_ELM_USE_EXFAT is not set
# end of elm-chan's FatFs, Generic FAT Filesystem Module

CONFIG_RT_USING_PAGECACHE=y

#
# page cache config
#
CONFIG_RT_PAGECACHE_COUNT=4096
CONFIG_RT_PAGECACHE_ASPACE_COUNT=1024
CONFIG_RT_PAGECACHE_PRELOAD=4
CONFIG_RT_PAGECACHE_HASH_NR=1024
CONFIG_RT_PAGECACHE_GC_WORK_LEVEL=90
CONFIG_RT_PAGECACHE_GC_STOP_LEVEL=70
# end of page cache config
CONFIG_RT_USING_DFS_DEVFS=y
CONFIG_RT_USING_DFS_ROMFS=y
# CONFIG_RT_USING_DFS_CROMFS is not set
CONFIG_RT_USING_DFS_TMPFS=y
# CONFIG_RT_USING_DFS_MQUEUE is not set
# end of DFS: device virtual file system

# CONFIG_RT_USING_FAL is not set
Expand Down Expand Up @@ -455,11 +450,8 @@ CONFIG_RT_USING_POSIX_DEVIO=y
CONFIG_RT_USING_POSIX_STDIO=y
CONFIG_RT_USING_POSIX_POLL=y
CONFIG_RT_USING_POSIX_SELECT=y
CONFIG_RT_USING_POSIX_EVENTFD=y
CONFIG_RT_USING_POSIX_EPOLL=y
CONFIG_RT_USING_POSIX_SIGNALFD=y
CONFIG_RT_SIGNALFD_MAX_NUM=10
CONFIG_RT_USING_POSIX_TIMERFD=y
# CONFIG_RT_USING_POSIX_EVENTFD is not set
# CONFIG_RT_USING_POSIX_TIMERFD is not set
CONFIG_RT_USING_POSIX_SOCKET=y
CONFIG_RT_USING_POSIX_TERMIOS=y
# CONFIG_RT_USING_POSIX_AIO is not set
Expand Down Expand Up @@ -503,12 +495,7 @@ CONFIG_SAL_USING_LWIP=y
# end of Docking with protocol stacks

CONFIG_SAL_USING_POSIX=y
CONFIG_RT_USING_AF_UNIX=y
CONFIG_AF_UNIX_DGRAM_MAX_SIZE=4096
CONFIG_AF_UNIX_DGRAM_QUEUE_LEN=16
CONFIG_AF_UNIX_STREAM_BUFFER_SIZE=4096
CONFIG_AF_UNIX_LISTEN_BACKLOG_MAX=16
CONFIG_AF_UNIX_RIGHTS_MAX=16
# CONFIG_RT_USING_AF_UNIX is not set
CONFIG_RT_USING_NETDEV=y
CONFIG_NETDEV_USING_IFCONFIG=y
CONFIG_NETDEV_USING_PING=y
Expand All @@ -523,6 +510,7 @@ CONFIG_RT_USING_LWIP=y
# CONFIG_RT_USING_LWIP141 is not set
# CONFIG_RT_USING_LWIP203 is not set
CONFIG_RT_USING_LWIP212=y
# CONFIG_RT_USING_LWIP221 is not set
# CONFIG_RT_USING_LWIP_LATEST is not set
CONFIG_RT_USING_LWIP_VER_NUM=0x20102
# CONFIG_RT_USING_LWIP_IPV6 is not set
Expand Down Expand Up @@ -625,22 +613,6 @@ CONFIG_RT_INIT_MEMORY_REGIONS=128
# end of Debugging
# end of Memory management

CONFIG_RT_USING_LWP=y
CONFIG_LWP_DEBUG=y
CONFIG_LWP_DEBUG_INIT=y
CONFIG_LWP_USING_RUNTIME=y
CONFIG_RT_LWP_MAX_NR=30
CONFIG_LWP_TASK_STACK_SIZE=16384
CONFIG_RT_CH_MSG_MAX_NR=1024
CONFIG_LWP_TID_MAX_NR=512
CONFIG_RT_LWP_SHM_MAX_NR=512
CONFIG_RT_USING_LDSO=y
# CONFIG_ELF_DEBUG_ENABLE is not set
# CONFIG_ELF_LOAD_RANDOMIZE is not set
CONFIG_LWP_USING_TERMINAL=y
CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
# CONFIG_RT_USING_VDSO is not set

#
# Using USB legacy version
#
Expand Down Expand Up @@ -954,15 +926,6 @@ CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
# end of RT-Thread online packages

CONFIG_SOC_VIRT64_AARCH64=y
CONFIG_RT_USING_DFS_V2=y
CONFIG_RT_USING_DFS_ELMFAT=y
CONFIG_RT_USING_DFS_DEVFS=y
CONFIG_RT_USING_DFS_ROMFS=y
CONFIG_RT_USING_DFS_PTYFS=y
CONFIG_RT_USING_DFS_PROCFS=y
# CONFIG_RT_USING_DFS_CROMFS is not set
CONFIG_RT_USING_DFS_TMPFS=y
# CONFIG_RT_USING_DFS_MQUEUE is not set
# CONFIG_PKG_USING_LORAWAN_DRIVER is not set
# CONFIG_PKG_USING_PAHOMQTT is not set
# CONFIG_PKG_USING_UMQTT is not set
Expand Down Expand Up @@ -1181,13 +1144,7 @@ CONFIG_RT_USING_DFS_TMPFS=y
# CONFIG_PKG_USING_LITTLEFS is not set
# CONFIG_PKG_USING_DFS_JFFS2 is not set
# CONFIG_PKG_USING_DFS_UFFS is not set
CONFIG_PKG_USING_LWEXT4=y
CONFIG_PKG_LWEXT4_PATH="/packages/system/lwext4"
CONFIG_RT_USING_DFS_LWEXT4=y
# CONFIG_PKG_USING_LWEXT4_V200 is not set
CONFIG_PKG_USING_LWEXT4_LATEST_VERSION=y
# CONFIG_PKG_USING_LWEXT4_V110 is not set
CONFIG_PKG_LWEXT4_VER="latest"
# CONFIG_PKG_USING_LWEXT4 is not set
# CONFIG_PKG_USING_THREAD_POOL is not set
# CONFIG_PKG_USING_ROBOTS is not set
# CONFIG_PKG_USING_EV is not set
Expand Down
55 changes: 8 additions & 47 deletions bsp/qemu-virt64-aarch64/rtconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
/* end of rt_strnlen options */
/* end of klibc options */
#define RT_NAME_MAX 16
#define RT_USING_SMART
#define RT_USING_SMP
#define RT_CPUS_NR 4
#define RT_ALIGN_SIZE 8
Expand Down Expand Up @@ -129,7 +128,7 @@
#define RT_CONSOLEBUF_SIZE 256
#define RT_CONSOLE_DEVICE_NAME "uart0"
#define RT_USING_CONSOLE_OUTPUT_CTL
#define RT_VER_NUM 0x50301
#define RT_VER_NUM 0x50400
#define RT_USING_STDC_ATOMIC
#define RT_BACKTRACE_LEVEL_MAX_NR 32
/* end of RT-Thread Kernel */
Expand All @@ -150,7 +149,6 @@
#define ARCH_MM_MMU
#define ARCH_ARM
#define ARCH_ARM_MMU
#define KERNEL_VADDR_START 0xffff000000000000
#define ARCH_ARMV8
#define ARCH_USING_ASID
#define ARCH_USING_HW_THREAD_SELF
Expand Down Expand Up @@ -183,6 +181,8 @@
#define DFS_USING_POSIX
#define DFS_USING_WORKDIR
#define DFS_FD_MAX 512
#define RT_USING_DFS_V2
#define RT_USING_DFS_ELMFAT

/* elm-chan's FatFs, Generic FAT Filesystem Module */

Expand All @@ -198,17 +198,9 @@
#define RT_DFS_ELM_REENTRANT
#define RT_DFS_ELM_MUTEX_TIMEOUT 3000
/* end of elm-chan's FatFs, Generic FAT Filesystem Module */
#define RT_USING_PAGECACHE

/* page cache config */

#define RT_PAGECACHE_COUNT 4096
#define RT_PAGECACHE_ASPACE_COUNT 1024
#define RT_PAGECACHE_PRELOAD 4
#define RT_PAGECACHE_HASH_NR 1024
#define RT_PAGECACHE_GC_WORK_LEVEL 90
#define RT_PAGECACHE_GC_STOP_LEVEL 70
/* end of page cache config */
#define RT_USING_DFS_DEVFS
#define RT_USING_DFS_ROMFS
#define RT_USING_DFS_TMPFS
/* end of DFS: device virtual file system */

/* Device Drivers */
Expand Down Expand Up @@ -288,11 +280,6 @@
#define RT_USING_POSIX_STDIO
#define RT_USING_POSIX_POLL
#define RT_USING_POSIX_SELECT
#define RT_USING_POSIX_EVENTFD
#define RT_USING_POSIX_EPOLL
#define RT_USING_POSIX_SIGNALFD
#define RT_SIGNALFD_MAX_NUM 10
#define RT_USING_POSIX_TIMERFD
#define RT_USING_POSIX_SOCKET
#define RT_USING_POSIX_TERMIOS
#define RT_USING_POSIX_MMAN
Expand Down Expand Up @@ -322,12 +309,6 @@
#define SAL_USING_LWIP
/* end of Docking with protocol stacks */
#define SAL_USING_POSIX
#define RT_USING_AF_UNIX
#define AF_UNIX_DGRAM_MAX_SIZE 4096
#define AF_UNIX_DGRAM_QUEUE_LEN 16
#define AF_UNIX_STREAM_BUFFER_SIZE 4096
#define AF_UNIX_LISTEN_BACKLOG_MAX 16
#define AF_UNIX_RIGHTS_MAX 16
#define RT_USING_NETDEV
#define NETDEV_USING_IFCONFIG
#define NETDEV_USING_PING
Expand Down Expand Up @@ -409,18 +390,6 @@

/* end of Debugging */
/* end of Memory management */
#define RT_USING_LWP
#define LWP_DEBUG
#define LWP_DEBUG_INIT
#define LWP_USING_RUNTIME
#define RT_LWP_MAX_NR 30
#define LWP_TASK_STACK_SIZE 16384
#define RT_CH_MSG_MAX_NR 1024
#define LWP_TID_MAX_NR 512
#define RT_LWP_SHM_MAX_NR 512
#define RT_USING_LDSO
#define LWP_USING_TERMINAL
#define LWP_PTY_MAX_PARIS_LIMIT 64

/* Using USB legacy version */

Expand All @@ -435,6 +404,7 @@

/* IoT - internet of things */


/* Wi-Fi */

/* Marvell WiFi */
Expand Down Expand Up @@ -603,6 +573,7 @@

/* Arduino libraries */


/* Projects and Demos */

/* end of Projects and Demos */
Expand Down Expand Up @@ -646,15 +617,5 @@
/* end of Arduino libraries */
/* end of RT-Thread online packages */
#define SOC_VIRT64_AARCH64
#define RT_USING_DFS_V2
#define RT_USING_DFS_ELMFAT
#define RT_USING_DFS_DEVFS
#define RT_USING_DFS_ROMFS
#define RT_USING_DFS_PTYFS
#define RT_USING_DFS_PROCFS
#define RT_USING_DFS_TMPFS
#define PKG_USING_LWEXT4
#define RT_USING_DFS_LWEXT4
#define PKG_USING_LWEXT4_LATEST_VERSION

#endif
Loading
Loading