diff --git a/boards/arm/samv7/common/Kconfig b/boards/arm/samv7/common/Kconfig
index 6b481e771fb..7a7f91bae76 100644
--- a/boards/arm/samv7/common/Kconfig
+++ b/boards/arm/samv7/common/Kconfig
@@ -5,7 +5,7 @@
 
 config BOARD_SAMV7_COMMON
 	bool "Board common logic"
-	default y
+	default n
 	---help---
 		 Board common logic located in each board/common folder.
 
diff --git a/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig b/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig
index c289e3b45f9..1f8d9f48520 100644
--- a/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig
+++ b/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig
@@ -25,6 +25,7 @@ CONFIG_ARMV7M_ICACHE=y
 CONFIG_ARMV7M_LAZYFPU=y
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=51262
+CONFIG_BOARD_SAMV7_COMMON=y
 CONFIG_BOOT_MCUBOOT=y
 CONFIG_BUILTIN=y
 CONFIG_FAT_LCNAMES=y
diff --git a/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig b/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig
index 7759dd8eb2b..56dc3196754 100644
--- a/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig
+++ b/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig
@@ -25,6 +25,7 @@ CONFIG_ARMV7M_ICACHE=y
 CONFIG_ARMV7M_LAZYFPU=y
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=51262
+CONFIG_BOARD_SAMV7_COMMON=y
 CONFIG_BOOT_MCUBOOT=y
 CONFIG_BUILTIN=y
 CONFIG_FAT_LCNAMES=y
diff --git a/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig b/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig
index e3e986aa855..3d8edfc5984 100644
--- a/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig
@@ -34,6 +34,7 @@ CONFIG_AT24XX_EXTSIZE=160
 CONFIG_AT24XX_SIZE=2
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=51262
+CONFIG_BOARD_SAMV7_COMMON=y
 CONFIG_BOOT_MCUBOOT=y
 CONFIG_BUILTIN=y
 CONFIG_FAT_LCNAMES=y
diff --git a/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig b/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig
index b0dd257c825..eedc79c3133 100644
--- a/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig
@@ -34,6 +34,7 @@ CONFIG_AT24XX_EXTSIZE=160
 CONFIG_AT24XX_SIZE=2
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=51262
+CONFIG_BOARD_SAMV7_COMMON=y
 CONFIG_BOOT_MCUBOOT=y
 CONFIG_BUILTIN=y
 CONFIG_FAT_LCNAMES=y
diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig
index fb03e149285..2d361eb5761 100644
--- a/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig
@@ -28,6 +28,7 @@ CONFIG_ARMV7M_LAZYFPU=y
 CONFIG_BOARDCTL_RESET=y
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=51262
+CONFIG_BOARD_SAMV7_COMMON=y
 CONFIG_BOOT_MCUBOOT=y
 CONFIG_BUILTIN=y
 CONFIG_FS_PROCFS=y
diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig
index e8e1ba5b91d..de7615149c1 100644
--- a/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig
@@ -28,6 +28,7 @@ CONFIG_ARMV7M_LAZYFPU=y
 CONFIG_BOARDCTL_RESET=y
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=51262
+CONFIG_BOARD_SAMV7_COMMON=y
 CONFIG_BOOT_MCUBOOT=y
 CONFIG_BUILTIN=y
 CONFIG_FS_PROCFS=y