diff --git a/boards/cc2538dk/Kconfig b/boards/cc2538dk/Kconfig
index 0bf24db89f..b35ca5d3a6 100644
--- a/boards/cc2538dk/Kconfig
+++ b/boards/cc2538dk/Kconfig
@@ -18,3 +18,4 @@ config BOARD_CC2538DK
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
     select HAS_EMULATOR_RENODE
+    select HAS_RIOTBOOT
diff --git a/boards/cc2538dk/Makefile.features b/boards/cc2538dk/Makefile.features
index db53ca13e3..41787bca08 100644
--- a/boards/cc2538dk/Makefile.features
+++ b/boards/cc2538dk/Makefile.features
@@ -11,3 +11,4 @@ FEATURES_PROVIDED += periph_uart
 
 # Various other features (if any)
 FEATURES_PROVIDED += emulator_renode
+FEATURES_PROVIDED += riotboot
diff --git a/boards/common/remote/Kconfig b/boards/common/remote/Kconfig
index 44f9d6343e..b0fdc072c3 100644
--- a/boards/common/remote/Kconfig
+++ b/boards/common/remote/Kconfig
@@ -15,3 +15,4 @@ config BOARD_COMMON_REMOTE
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+    select HAS_RIOTBOOT
diff --git a/boards/common/remote/Makefile.features b/boards/common/remote/Makefile.features
index e670985d02..7c01229982 100644
--- a/boards/common/remote/Makefile.features
+++ b/boards/common/remote/Makefile.features
@@ -8,3 +8,6 @@ FEATURES_PROVIDED += periph_rtt
 FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
+
+# Put other features for this board (in alphabetical order)
+FEATURES_PROVIDED += riotboot
diff --git a/boards/omote/Kconfig b/boards/omote/Kconfig
index ac83943e0e..e2f484819e 100644
--- a/boards/omote/Kconfig
+++ b/boards/omote/Kconfig
@@ -17,3 +17,4 @@ config BOARD_OMOTE
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+    select HAS_RIOTBOOT
diff --git a/boards/omote/Makefile.features b/boards/omote/Makefile.features
index e670985d02..7c01229982 100644
--- a/boards/omote/Makefile.features
+++ b/boards/omote/Makefile.features
@@ -8,3 +8,6 @@ FEATURES_PROVIDED += periph_rtt
 FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
+
+# Put other features for this board (in alphabetical order)
+FEATURES_PROVIDED += riotboot
diff --git a/boards/openmote-b/Kconfig b/boards/openmote-b/Kconfig
index 3a09f88827..f09a0f6ec2 100644
--- a/boards/openmote-b/Kconfig
+++ b/boards/openmote-b/Kconfig
@@ -17,3 +17,4 @@ config BOARD_OPENMOTE_B
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+    select HAS_RIOTBOOT
diff --git a/boards/openmote-b/Makefile.features b/boards/openmote-b/Makefile.features
index e670985d02..7c01229982 100644
--- a/boards/openmote-b/Makefile.features
+++ b/boards/openmote-b/Makefile.features
@@ -8,3 +8,6 @@ FEATURES_PROVIDED += periph_rtt
 FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
+
+# Put other features for this board (in alphabetical order)
+FEATURES_PROVIDED += riotboot
diff --git a/boards/openmote-cc2538/Kconfig b/boards/openmote-cc2538/Kconfig
index ea1a4c9227..324d05fc9c 100644
--- a/boards/openmote-cc2538/Kconfig
+++ b/boards/openmote-cc2538/Kconfig
@@ -16,3 +16,4 @@ config BOARD_OPENMOTE_CC2538
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+    select HAS_RIOTBOOT
diff --git a/boards/openmote-cc2538/Makefile.features b/boards/openmote-cc2538/Makefile.features
index d36aa48436..0d8312c637 100644
--- a/boards/openmote-cc2538/Makefile.features
+++ b/boards/openmote-cc2538/Makefile.features
@@ -7,3 +7,6 @@ FEATURES_PROVIDED += periph_i2c
 FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
+
+# Put other features for this board (in alphabetical order)
+FEATURES_PROVIDED += riotboot
diff --git a/cpu/cc2538/Kconfig b/cpu/cc2538/Kconfig
index 59aaf6c789..84d80a2675 100644
--- a/cpu/cc2538/Kconfig
+++ b/cpu/cc2538/Kconfig
@@ -18,7 +18,6 @@ config CPU_FAM_CC2538
     select HAS_PERIPH_HWRNG
     select HAS_PERIPH_UART_MODECFG
     select HAS_PERIPH_WDT
-    select HAS_RIOTBOOT
 
 ## CPU Models
 config CPU_MODEL_CC2538NF53
diff --git a/cpu/cc2538/Makefile.features b/cpu/cc2538/Makefile.features
index 50dedb106f..2b6665241f 100644
--- a/cpu/cc2538/Makefile.features
+++ b/cpu/cc2538/Makefile.features
@@ -10,6 +10,5 @@ FEATURES_PROVIDED += periph_uart_modecfg
 FEATURES_PROVIDED += periph_wdt
 
 FEATURES_PROVIDED += cortexm_mpu
-FEATURES_PROVIDED += riotboot
 
 include $(RIOTCPU)/cortexm_common/Makefile.features