diff --git a/core/arch/riscv/kernel/boot.c b/core/arch/riscv/kernel/boot.c
index 4e59bcc2437..5b09076568a 100644
--- a/core/arch/riscv/kernel/boot.c
+++ b/core/arch/riscv/kernel/boot.c
@@ -140,6 +140,7 @@ void boot_init_primary_late(unsigned long fdt,
 			    unsigned long tos_fw_config __unused)
 {
 	init_external_dt(fdt, CFG_DTB_MAX_SIZE);
+	discover_nsec_memory();
 	update_external_dt();
 
 	IMSG("OP-TEE version: %s", core_v_str);
diff --git a/core/arch/riscv/plat-virt/conf.mk b/core/arch/riscv/plat-virt/conf.mk
index cc65e0a8cf6..fbf2c85d04c 100644
--- a/core/arch/riscv/plat-virt/conf.mk
+++ b/core/arch/riscv/plat-virt/conf.mk
@@ -2,7 +2,8 @@ $(call force,CFG_RV64_core,y)
 
 $(call force,CFG_CORE_LARGE_PHYS_ADDR,y)
 $(call force,CFG_TEE_CORE_DEBUG,n)
-$(call force,CFG_CORE_DYN_SHM,n)
+$(call force,CFG_CORE_RESERVED_SHM,n)
+$(call force,CFG_CORE_DYN_SHM,y)
 
 CFG_DT ?= y
 
@@ -41,7 +42,4 @@ supported-ta-targets = ta_rv64
 # Memory layout flags
 CFG_TDDRAM_START ?= 0x8e000000
 CFG_TDDRAM_SIZE  ?= 0x00f00000
-$(call force,CFG_CORE_RESERVED_SHM,y)
-CFG_SHMEM_START  ?= 0x88f00000
-CFG_SHMEM_SIZE   ?= 0x00200000
 CFG_TEE_RAM_VA_SIZE ?= 0x00200000