diff --git a/cpu/sam0_common/Kconfig b/cpu/sam0_common/Kconfig
index 5aeba2af99..aff1490922 100644
--- a/cpu/sam0_common/Kconfig
+++ b/cpu/sam0_common/Kconfig
@@ -5,9 +5,26 @@
 # directory for more details.
 #
 
-config CPU_FAMILY_SAM0
+config CPU_COMMON_SAM0
     bool
-    default y
+    select HAS_PERIPH_CPUID
+    select HAS_PERIPH_FLASHPAGE
+    select HAS_PERIPH_FLASHPAGE_RAW
+    select HAS_PERIPH_FLASHPAGE_RWEE
+    select HAS_PERIPH_GPIO
+    select HAS_PERIPH_GPIO_IRQ
+    select HAS_PERIPH_I2C_RECONFIGURE
+    select HAS_PERIPH_TIMER_PERIODIC
+    select HAS_PERIPH_UART_MODECFG
+    select HAS_PERIPH_UART_NONBLOCKING
+    select HAS_PERIPH_WDT
+    select HAS_PERIPH_WDT_CB
     select HAS_WDT_WARNING_PERIOD
 
+if CPU_COMMON_SAM0
+
 rsource "periph/Kconfig"
+
+endif # CPU_COMMON_SAM0
+
+source "$(RIOTCPU)/cortexm_common/Kconfig"
diff --git a/cpu/sam0_common/periph/Kconfig b/cpu/sam0_common/periph/Kconfig
index 38c15739e1..dab8e01f39 100644
--- a/cpu/sam0_common/periph/Kconfig
+++ b/cpu/sam0_common/periph/Kconfig
@@ -5,5 +5,5 @@
 # directory for more details.
 
 config WDT_WARNING_PERIOD
-    depends on HAS_WDT_WARNING_PERIOD && KCONFIG_MODULE_PERIPH_WDT
+    depends on HAS_PERIPH_WDT_WARNING_PERIOD && KCONFIG_MODULE_PERIPH_WDT
     default 1