diff --git a/soc/riscv/openisa_rv32m1/linker.ld b/soc/riscv/openisa_rv32m1/linker.ld
index 1d6ad001879..e63459b52e3 100644
--- a/soc/riscv/openisa_rv32m1/linker.ld
+++ b/soc/riscv/openisa_rv32m1/linker.ld
@@ -33,15 +33,15 @@
 #ifdef CONFIG_BOOTLOADER_MCUBOOT
 
 
-#define ROM_BASE (DT_CODE_PARTITION_OFFSET)
-#define ROM_SIZE (DT_CODE_PARTITION_SIZE)
+#define ROM_BASE (DT_REG_ADDR(DT_CHOSEN(zephyr_code_partition)))
+#define ROM_SIZE (DT_REG_SIZE(DT_CHOSEN(zephyr_code_partition)))
 
 #define VECTOR_BASE (ROM_BASE + CONFIG_TEXT_SECTION_OFFSET)
 
 #else
 
-#define ROM_BASE DT_CODE_PARTITION_OFFSET
-#define ROM_SIZE (DT_CODE_PARTITION_SIZE - VECTOR_SIZE)
+#define ROM_BASE (DT_REG_ADDR(DT_CHOSEN(zephyr_code_partition)))
+#define ROM_SIZE (DT_REG_SIZE(DT_CHOSEN(zephyr_code_partition)) - VECTOR_BASE)
 
 #define VECTOR_BASE (ROM_BASE + ROM_SIZE)