diff --git a/cmake/savedefconfig.cmake b/cmake/savedefconfig.cmake
index cbfadf6917..c6f06e3ff4 100644
--- a/cmake/savedefconfig.cmake
+++ b/cmake/savedefconfig.cmake
@@ -35,6 +35,7 @@ foreach(NameAndValue ${ConfigContents})
      OR "${NameAndValue}" MATCHES "^CONFIG_ARCH_CHIP_"
      OR "${NameAndValue}" MATCHES "CONFIG_ARCH_CHIP="
      OR "${NameAndValue}" MATCHES "CONFIG_ARCH_BOARD="
+     OR "${NameAndValue}" MATCHES "CONFIG_ARCH_BOARD_COMMON="
      OR "${NameAndValue}" MATCHES "^CONFIG_ARCH_CUSTOM"
      OR "${NameAndValue}" MATCHES "^CONFIG_ARCH_BOARD_CUSTOM")
     decode_semicolon(Value)
diff --git a/tools/Unix.mk b/tools/Unix.mk
index c497678063..a9e0a490cb 100644
--- a/tools/Unix.mk
+++ b/tools/Unix.mk
@@ -753,6 +753,7 @@ savedefconfig: apps_preconfig
 	$(Q) grep "^CONFIG_ARCH_CHIP_" .config >> defconfig.tmp; true
 	$(Q) grep "CONFIG_ARCH_CHIP=" .config >> defconfig.tmp; true
 	$(Q) grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp; true
+	$(Q) grep "CONFIG_ARCH_BOARD_COMMON=" .config >> defconfig.tmp; true
 	$(Q) grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp; true
 	$(Q) grep "^CONFIG_ARCH_BOARD_CUSTOM" .config >> defconfig.tmp; true
 	$(Q) export LC_ALL=C; cat defconfig.tmp | sort | uniq > sortedconfig.tmp