From 7207ed7b84346865ba39cf887ba4089f7d3d31a7 Mon Sep 17 00:00:00 2001 From: BernardXiong Date: Thu, 19 Aug 2021 13:48:16 +0800 Subject: [PATCH 1/2] [bsp] remove exec attribute for Kconfig/link.lds files --- bsp/qemu-virt64-aarch64/Kconfig | 0 bsp/qemu-virt64-aarch64/SConstruct | 0 bsp/qemu-virt64-aarch64/link.lds | 0 bsp/qemu-virt64-aarch64/qemu.bat | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 bsp/qemu-virt64-aarch64/Kconfig mode change 100755 => 100644 bsp/qemu-virt64-aarch64/SConstruct mode change 100755 => 100644 bsp/qemu-virt64-aarch64/link.lds mode change 100755 => 100644 bsp/qemu-virt64-aarch64/qemu.bat diff --git a/bsp/qemu-virt64-aarch64/Kconfig b/bsp/qemu-virt64-aarch64/Kconfig old mode 100755 new mode 100644 diff --git a/bsp/qemu-virt64-aarch64/SConstruct b/bsp/qemu-virt64-aarch64/SConstruct old mode 100755 new mode 100644 diff --git a/bsp/qemu-virt64-aarch64/link.lds b/bsp/qemu-virt64-aarch64/link.lds old mode 100755 new mode 100644 diff --git a/bsp/qemu-virt64-aarch64/qemu.bat b/bsp/qemu-virt64-aarch64/qemu.bat old mode 100755 new mode 100644 -- Gitee From 174c76181a23d51669b553bd7fde66696cc9fbf3 Mon Sep 17 00:00:00 2001 From: BernardXiong Date: Thu, 19 Aug 2021 14:09:38 +0800 Subject: [PATCH 2/2] [bsp] Add mnt.c for rom file and code cleanup --- bsp/qemu-virt64-aarch64/.config | 11 +++----- bsp/qemu-virt64-aarch64/Kconfig | 4 +-- bsp/qemu-virt64-aarch64/applications/main.c | 2 -- bsp/qemu-virt64-aarch64/applications/mnt.c | 29 +++++++++++++++++++++ bsp/qemu-virt64-aarch64/rtconfig.h | 4 --- 5 files changed, 34 insertions(+), 16 deletions(-) mode change 100755 => 100644 bsp/qemu-virt64-aarch64/.config create mode 100644 bsp/qemu-virt64-aarch64/applications/mnt.c diff --git a/bsp/qemu-virt64-aarch64/.config b/bsp/qemu-virt64-aarch64/.config old mode 100755 new mode 100644 index 0dfd265e59..a586777f6e --- a/bsp/qemu-virt64-aarch64/.config +++ b/bsp/qemu-virt64-aarch64/.config @@ -176,11 +176,10 @@ CONFIG_RT_USING_LIBC=y CONFIG_RT_USING_MUSL=y # CONFIG_RT_USING_PTHREADS is not set CONFIG_RT_USING_POSIX=y -CONFIG_RT_USING_POSIX_MMAP=y -CONFIG_RT_USING_POSIX_TERMIOS=y +# CONFIG_RT_USING_POSIX_MMAP is not set +# CONFIG_RT_USING_POSIX_TERMIOS is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -CONFIG_RT_USING_POSIX_AIO=y -CONFIG_RT_POSIX_AIO_THREAD_STACK_SIZE=8192 +# CONFIG_RT_USING_POSIX_AIO is not set CONFIG_RT_USING_POSIX_CLOCKTIME=y # CONFIG_RT_USING_MODULE is not set @@ -276,7 +275,6 @@ CONFIG_LWP_TID_MAX_NR=64 # CONFIG_PKG_USING_AT_DEVICE is not set # CONFIG_PKG_USING_ATSRV_SOCKET is not set # CONFIG_PKG_USING_WIZNET is not set -# CONFIG_PKG_USING_ZB_COORDINATOR is not set # # IoT Cloud @@ -317,7 +315,6 @@ CONFIG_LWP_TID_MAX_NR=64 # CONFIG_PKG_USING_AGILE_MODBUS is not set # CONFIG_PKG_USING_AGILE_FTP is not set # CONFIG_PKG_USING_EMBEDDEDPROTO is not set -# CONFIG_PKG_USING_RT_LINK_HW is not set # # security packages @@ -349,7 +346,6 @@ CONFIG_LWP_TID_MAX_NR=64 # CONFIG_PKG_USING_TOUCHGFX2RTT is not set # CONFIG_PKG_USING_NUEMWIN is not set # CONFIG_PKG_USING_MP3PLAYER is not set -# CONFIG_PKG_USING_TINYJPEG is not set # # tools packages @@ -514,7 +510,6 @@ CONFIG_LWP_TID_MAX_NR=64 # CONFIG_PKG_USING_KOBUKI is not set # CONFIG_PKG_USING_ROSSERIAL is not set # CONFIG_PKG_USING_MICRO_ROS is not set -# CONFIG_PKG_USING_MCP23008 is not set # # AI packages diff --git a/bsp/qemu-virt64-aarch64/Kconfig b/bsp/qemu-virt64-aarch64/Kconfig index 722ce1da35..7f8a9079f3 100644 --- a/bsp/qemu-virt64-aarch64/Kconfig +++ b/bsp/qemu-virt64-aarch64/Kconfig @@ -22,12 +22,12 @@ config SOC_VIRT64_AARCH64 bool select ARCH_ARMV8 select ARCH_CPU_64BIT - select RT_USING_CACHE select ARCH_ARM_MMU + select RT_USING_CACHE select RT_USING_COMPONENTS_INIT select RT_USING_USER_MAIN - select BSP_USING_GIC select RT_USING_GIC + select BSP_USING_GIC select BSP_USING_GIC390 default y diff --git a/bsp/qemu-virt64-aarch64/applications/main.c b/bsp/qemu-virt64-aarch64/applications/main.c index 5df3ff4218..6c6d5af268 100644 --- a/bsp/qemu-virt64-aarch64/applications/main.c +++ b/bsp/qemu-virt64-aarch64/applications/main.c @@ -16,5 +16,3 @@ int main(void) return 0; } - - diff --git a/bsp/qemu-virt64-aarch64/applications/mnt.c b/bsp/qemu-virt64-aarch64/applications/mnt.c new file mode 100644 index 0000000000..ed84f210d5 --- /dev/null +++ b/bsp/qemu-virt64-aarch64/applications/mnt.c @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2021/08/19 bernard the first version + */ + +#include + +#ifdef RT_USING_DFS +#include +#include + +int mnt_init(void) +{ + if (dfs_mount(RT_NULL, "/", "rom", 0, &romfs_root) != 0) + { + rt_kprintf("Dir / mount failed!\n"); + return -1; + } + + rt_kprintf("file system initialization done!\n"); + return 0; +} +INIT_ENV_EXPORT(mnt_init); +#endif diff --git a/bsp/qemu-virt64-aarch64/rtconfig.h b/bsp/qemu-virt64-aarch64/rtconfig.h index 03fd13ef66..e6fc62bea9 100644 --- a/bsp/qemu-virt64-aarch64/rtconfig.h +++ b/bsp/qemu-virt64-aarch64/rtconfig.h @@ -108,10 +108,6 @@ #define RT_USING_LIBC #define RT_USING_MUSL #define RT_USING_POSIX -#define RT_USING_POSIX_MMAP -#define RT_USING_POSIX_TERMIOS -#define RT_USING_POSIX_AIO -#define RT_POSIX_AIO_THREAD_STACK_SIZE 8192 #define RT_USING_POSIX_CLOCKTIME /* Network */ -- Gitee