diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/flats/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/flats/defconfig
index 634c4f7ac9..cab54f6a6d 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/flats/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/flats/defconfig
@@ -52,7 +52,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
 CONFIG_PATH_INITIAL="/system/bin"
 CONFIG_RAM_SIZE=33554432
-CONFIG_RAM_START=0x80000000
+CONFIG_RAM_START=0x80200000
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_RISCV_SEMIHOSTING_HOSTFS=y
 CONFIG_RR_INTERVAL=200
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/flats64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/flats64/defconfig
index d3f24d81f1..23b5ab30b1 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/flats64/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/flats64/defconfig
@@ -55,7 +55,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
 CONFIG_PATH_INITIAL="/system/bin"
 CONFIG_RAM_SIZE=33554432
-CONFIG_RAM_START=0x80000000
+CONFIG_RAM_START=0x80200000
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_RISCV_SEMIHOSTING_HOSTFS=y
 CONFIG_RR_INTERVAL=200
diff --git a/boards/risc-v/qemu-rv/rv-virt/scripts/ld.script b/boards/risc-v/qemu-rv/rv-virt/scripts/ld.script
index 1b169a37e9..e2c0bbd820 100644
--- a/boards/risc-v/qemu-rv/rv-virt/scripts/ld.script
+++ b/boards/risc-v/qemu-rv/rv-virt/scripts/ld.script
@@ -20,11 +20,7 @@
 
 #include <nuttx/config.h>
 
-#ifdef CONFIG_ARCH_USE_S_MODE
-#define TEXT_ADDR     0x80200000
-#else
-#define TEXT_ADDR     0x80000000
-#endif
+#define TEXT_ADDR     CONFIG_RAM_START
 
 SECTIONS
 {