diff --git a/boards/common/saml1x/Makefile.features b/boards/common/saml1x/Makefile.features
index fcac28be9e..b2cc882d4c 100644
--- a/boards/common/saml1x/Makefile.features
+++ b/boards/common/saml1x/Makefile.features
@@ -7,6 +7,9 @@ FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
+# Put other features on these boards (in alphabetical order)
+FEATURES_PROVIDED += riotboot
+
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m23
 
diff --git a/cpu/cortexm_common/include/cpu.h b/cpu/cortexm_common/include/cpu.h
index aa1364c492..676b086ebc 100644
--- a/cpu/cortexm_common/include/cpu.h
+++ b/cpu/cortexm_common/include/cpu.h
@@ -217,10 +217,11 @@ static inline void cpu_jump_to_image(uint32_t image_address)
     __asm("BX %0" :: "r" (destination_address));
 }
 
-/* The following register is only present for Cortex-M0+, -M3, -M4 and -M7 CPUs */
+/* The following register is only present for
+   Cortex-M0+, -M3, -M4, -M7 and -M23 CPUs */
 #if defined(CPU_ARCH_CORTEX_M0PLUS) || defined(CPU_ARCH_CORTEX_M3) || \
     defined(CPU_ARCH_CORTEX_M4) || defined(CPU_ARCH_CORTEX_M4F) || \
-    defined(CPU_ARCH_CORTEX_M7)
+    defined(CPU_ARCH_CORTEX_M7) || defined(CPU_ARCH_CORTEX_M23)
 static inline uint32_t cpu_get_image_baseaddr(void)
 {
     return SCB->VTOR;