diff --git a/Makefile b/Makefile
index a1aff5b10..1a119cd12 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ endif
 undefine PLATFORM
 
 ifndef BOARD
-$(error BOARD must be set (apl-mrb, apl-nuc, dnv-cb2, nuc6cayh)
+$(error BOARD must be set (apl-mrb, apl-nuc, apl-up2, dnv-cb2, kbl-nuc-i7, nuc6cayh, nuc7i7bnh)
 endif
 
 ifeq ($(BOARD),apl-nuc)
diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index 2e3de040c..6aab4095d 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -109,16 +109,7 @@ INCLUDE_PATH += include/dm
 INCLUDE_PATH += bsp/include
 INCLUDE_PATH += boot/include
 INCLUDE_PATH += $(HV_OBJDIR)/include
-
-BOARD_CONFIG_PATH := arch/x86/configs/$(CONFIG_BOARD)
-BOARD_SOS_VM_CONFIG := $(BOARD_CONFIG_PATH)/sos_vm.h
-ifeq ($(CONFIG_PARTITION_MODE),y)
 INCLUDE_PATH += arch/x86/configs/$(CONFIG_BOARD)
-else ifeq (, $(wildcard $(BOARD_SOS_VM_CONFIG)))
-INCLUDE_PATH += arch/x86/configs/default
-else
-INCLUDE_PATH += arch/x86/configs/$(CONFIG_BOARD)
-endif
 
 CC ?= gcc
 AS ?= as
diff --git a/hypervisor/arch/x86/configs/apl-mrb/sos_vm.h b/hypervisor/arch/x86/configs/apl-mrb/sos_vm.h
new file mode 120000
index 000000000..86d830213
--- /dev/null
+++ b/hypervisor/arch/x86/configs/apl-mrb/sos_vm.h
@@ -0,0 +1 @@
+../sos_vm.h
\ No newline at end of file
diff --git a/hypervisor/arch/x86/configs/apl-nuc b/hypervisor/arch/x86/configs/apl-nuc
new file mode 120000
index 000000000..92a6acd0b
--- /dev/null
+++ b/hypervisor/arch/x86/configs/apl-nuc
@@ -0,0 +1 @@
+nuc6cayh
\ No newline at end of file
diff --git a/hypervisor/arch/x86/configs/apl-up2/sos_vm.h b/hypervisor/arch/x86/configs/apl-up2/sos_vm.h
new file mode 120000
index 000000000..86d830213
--- /dev/null
+++ b/hypervisor/arch/x86/configs/apl-up2/sos_vm.h
@@ -0,0 +1 @@
+../sos_vm.h
\ No newline at end of file
diff --git a/hypervisor/arch/x86/configs/dnv-cb2/sos_vm.h b/hypervisor/arch/x86/configs/dnv-cb2/sos_vm.h
new file mode 120000
index 000000000..86d830213
--- /dev/null
+++ b/hypervisor/arch/x86/configs/dnv-cb2/sos_vm.h
@@ -0,0 +1 @@
+../sos_vm.h
\ No newline at end of file
diff --git a/hypervisor/arch/x86/configs/kbl-nuc-i7 b/hypervisor/arch/x86/configs/kbl-nuc-i7
new file mode 120000
index 000000000..94ec7b923
--- /dev/null
+++ b/hypervisor/arch/x86/configs/kbl-nuc-i7
@@ -0,0 +1 @@
+nuc7i7bnh
\ No newline at end of file
diff --git a/hypervisor/arch/x86/configs/kbl-nuc-i7.config b/hypervisor/arch/x86/configs/kbl-nuc-i7.config
new file mode 120000
index 000000000..3984bf9ee
--- /dev/null
+++ b/hypervisor/arch/x86/configs/kbl-nuc-i7.config
@@ -0,0 +1 @@
+nuc7i7bnh.config
\ No newline at end of file
diff --git a/hypervisor/arch/x86/configs/nuc6cayh/sos_vm.h b/hypervisor/arch/x86/configs/nuc6cayh/sos_vm.h
new file mode 120000
index 000000000..86d830213
--- /dev/null
+++ b/hypervisor/arch/x86/configs/nuc6cayh/sos_vm.h
@@ -0,0 +1 @@
+../sos_vm.h
\ No newline at end of file
diff --git a/hypervisor/arch/x86/configs/nuc7i7bnh.config b/hypervisor/arch/x86/configs/nuc7i7bnh.config
new file mode 100644
index 000000000..9bc8aa415
--- /dev/null
+++ b/hypervisor/arch/x86/configs/nuc7i7bnh.config
@@ -0,0 +1,3 @@
+# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib)
+CONFIG_BOARD="NUC7i7BNH"
+CONFIG_SERIAL_LEGACY=y
diff --git a/hypervisor/arch/x86/configs/nuc7i7bnh/sos_vm.h b/hypervisor/arch/x86/configs/nuc7i7bnh/sos_vm.h
new file mode 120000
index 000000000..86d830213
--- /dev/null
+++ b/hypervisor/arch/x86/configs/nuc7i7bnh/sos_vm.h
@@ -0,0 +1 @@
+../sos_vm.h
\ No newline at end of file
diff --git a/hypervisor/arch/x86/configs/default/sos_vm.h b/hypervisor/arch/x86/configs/sos_vm.h
similarity index 62%
rename from hypervisor/arch/x86/configs/default/sos_vm.h
rename to hypervisor/arch/x86/configs/sos_vm.h
index 763fc1ae1..fe6e93cd5 100644
--- a/hypervisor/arch/x86/configs/default/sos_vm.h
+++ b/hypervisor/arch/x86/configs/sos_vm.h
@@ -3,6 +3,13 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
+/*
+ * This is a template of sos_vm.h and is linked to ./$(CONFIG_BOARD)/sos_vm.h,
+ * If you need a board specific sos_vm.h, make a copy in ./$(CONFIG_BOARD)/
+ * and replace the original symbol link.
+ */
+
 #ifndef SOS_VM_CONFIG_H
 #define SOS_VM_CONFIG_H