From b46ee082307b689ff08d786a7dacd3813882ad80 Mon Sep 17 00:00:00 2001 From: Yanfeng Liu Date: Sun, 21 Jan 2024 20:08:44 +0800 Subject: [PATCH] rv-virt/configs: avoid build errors - disable NSH_SYMTAB to avoid build errors with cmake. - enable LIBM to avoid build errors with Ubuntu stock gcc-riscv64-unknown-elf toolchain. - use HELLO=y for easy use within qemu console. Signed-off-by: Yanfeng Liu --- boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig | 5 ++--- boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig index 4aa6358ebd5..2cfe94289bb 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig @@ -32,7 +32,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y CONFIG_ELF=y -CONFIG_EXAMPLES_HELLO=m +CONFIG_EXAMPLES_HELLO=y CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 @@ -42,13 +42,12 @@ CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y +CONFIG_LIBM=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y -CONFIG_NSH_SYMTAB=y -CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" CONFIG_PATH_INITIAL="/system/bin" CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x80000000 diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig index 37cd640d5fe..b0945434392 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig @@ -45,14 +45,12 @@ CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y +CONFIG_LIBM=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y -CONFIG_NSH_SYMTAB=y -CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_PATH_INITIAL="/system/bin" CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x80000000