HV: remove default folder in configs

Add sos_vm.h as a template in configs folder and is linked to configs/$(CONFIG_BOARD)/sos_vm.h. If customer need a board specific sos_vm.h, make a copy in configs/$(CONFIG_BOARD)/ and replace the symbol link. Tracked-On: #2291 Signed-off-by: Victor Sun <victor.sun@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
projectacrn · Feb 26, 2019 · a25f1a4 · a25f1a4
1 parent f9b5e21
commit a25f1a4
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 10 deletions.
diff --git 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
@@ -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
@@ -0,0 +1 @@
+../sos_vm.h
diff --git a/hypervisor/arch/x86/configs/apl-nuc b/hypervisor/arch/x86/configs/apl-nuc
@@ -0,0 +1 @@
+nuc6cayh
diff --git a/hypervisor/arch/x86/configs/apl-up2/sos_vm.h b/hypervisor/arch/x86/configs/apl-up2/sos_vm.h
@@ -0,0 +1 @@
+../sos_vm.h
diff --git a/hypervisor/arch/x86/configs/dnv-cb2/sos_vm.h b/hypervisor/arch/x86/configs/dnv-cb2/sos_vm.h
@@ -0,0 +1 @@
+../sos_vm.h
diff --git a/hypervisor/arch/x86/configs/kbl-nuc-i7 b/hypervisor/arch/x86/configs/kbl-nuc-i7
@@ -0,0 +1 @@
+nuc7i7bnh
diff --git a/hypervisor/arch/x86/configs/kbl-nuc-i7.config b/hypervisor/arch/x86/configs/kbl-nuc-i7.config
@@ -0,0 +1 @@
+nuc7i7bnh.config
diff --git a/hypervisor/arch/x86/configs/nuc6cayh/sos_vm.h b/hypervisor/arch/x86/configs/nuc6cayh/sos_vm.h
@@ -0,0 +1 @@
+../sos_vm.h
diff --git a/hypervisor/arch/x86/configs/nuc7i7bnh.config 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
@@ -0,0 +1 @@
+../sos_vm.h
diff --git a/hypervisor/arch/x86/configs/default/sos_vm.h → hypervisor/arch/x86/configs/sos_vm.h b/hypervisor/arch/x86/configs/default/sos_vm.h → 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