diff --git a/arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h b/arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h
index 06a7f7f923..094fc7cd10 100644
--- a/arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h
+++ b/arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h
@@ -60,10 +60,17 @@
 #define STM32L4_SYSMEM_BASE    0x1fff0000     /* 0x1fff0000-0x1fff6fff: System memory */
 #define STM32L4_OTP_BASE       0x1fff7000     /* 0x1fff7000-0x1fff73ff: OTP memory */
                                               /* 0x1fff7400-0x1fff77ff: Reserved */
-#define STM32L4_OPTION_BASE    0x1fff7800     /* 0x1fff7800-0x1fff780f: Option bytes */
+#ifdef CONFIG_STM32L4_STM32L4XR
+#  define STM32L4_OPTION_BASE  0x1ff00000     /* 0x1ff00000-0x1ff0000f: Option bytes */
+                                              /* 0x1ff00010-0x1ff00fff: Reserved */
+#  define STM32L4_OPTION2_BASE 0x1ff01000     /* 0x1ff01000-0x1ff0100f: Option bytes 2 */
+                                              /* 0x1ff01010-0x1ff01fff: Reserved */
+#else
+#  define STM32L4_OPTION_BASE  0x1fff7800     /* 0x1fff7800-0x1fff780f: Option bytes */
                                               /* 0x1fff7810-0x1ffff7ff: Reserved */
-#define STM32L4_OPTION2_BASE   0x1ffff800     /* 0x1ffff800-0x1ffff80f: Option bytes 2 */
+#  define STM32L4_OPTION2_BASE 0x1ffff800     /* 0x1ffff800-0x1ffff80f: Option bytes 2 */
                                               /* 0x1ffff810-0x1fffffff: Reserved */
+#endif
 
 /* System Memory Addresses **************************************************/