You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/05/22 08:40:21 UTC
(nuttx) 01/03: ci/riscv: fix rv-virt/kfb64 CI issue
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 3bfdb14f4d0bb7a92b4f114610cbcbc47ffbe877
Author: Yanfeng Liu <yf...@qq.com>
AuthorDate: Tue May 21 19:03:52 2024 +0800
ci/riscv: fix rv-virt/kfb64 CI issue
This fixes `Linux(risc-v)` CI issue
`section .data LMA [0000000080200000,000000008020046f] overlaps
section .text LMA [0000000080200000,000000008021b2f3]`
Signed-off-by: Yanfeng Liu <yf...@qq.com>
---
boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig
index 5083239b82..d78ba1556b 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig
@@ -32,9 +32,9 @@ CONFIG_ARCH_HEAP_VBASE=0xC0200000
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_KERNEL_STACKSIZE=3072
CONFIG_ARCH_PGPOOL_MAPPING=y
-CONFIG_ARCH_PGPOOL_PBASE=0x80400000
+CONFIG_ARCH_PGPOOL_PBASE=0x80600000
CONFIG_ARCH_PGPOOL_SIZE=4194304
-CONFIG_ARCH_PGPOOL_VBASE=0x80400000
+CONFIG_ARCH_PGPOOL_VBASE=0x80600000
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_SHM_NPAGES=512
CONFIG_ARCH_SHM_VBASE=0xC2000000
@@ -45,6 +45,7 @@ CONFIG_ARCH_USE_MMU=y
CONFIG_ARCH_USE_MPU=y
CONFIG_ARCH_USE_S_MODE=y
CONFIG_BINFMT_ELF_EXECUTABLE=y
+CONFIG_BOARDCTL_POWEROFF=y
CONFIG_BOARD_LOOPSPERMSEC=6366
CONFIG_BUILD_KERNEL=y
CONFIG_DEBUG_ASSERTIONS=y
@@ -88,8 +89,8 @@ CONFIG_NSH_FILE_APPS=y
CONFIG_NSH_READLINE=y
CONFIG_PATH_INITIAL="/system/bin"
CONFIG_RAM_SIZE=2097152
-CONFIG_RAM_START=0x80200000
-CONFIG_RAM_VSTART=0x80200000
+CONFIG_RAM_START=0x80400000
+CONFIG_RAM_VSTART=0x80400000
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RISCV_SEMIHOSTING_HOSTFS=y
CONFIG_RR_INTERVAL=200