github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-19 12:12:16 +00:00
Code Issues Projects Releases Wiki Activity

HV: remove default folder in configs

Browse Source 
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>
This commit is contained in:
Victor Sun 2019-02-25 11:20:31 +08:00 committed by ACRN System Integration
parent f9b5e21bdc
commit a25f1a4060
12 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -19,7 +19,7 @@ endif
undefine PLATFORM undefine PLATFORM
ifndef BOARD 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 endif
ifeq ($(BOARD),apl-nuc) ifeq ($(BOARD),apl-nuc)

9
hypervisor/Makefile
View File

@ -109,16 +109,7 @@ INCLUDE_PATH += include/dm
INCLUDE_PATH += bsp/include INCLUDE_PATH += bsp/include
INCLUDE_PATH += boot/include INCLUDE_PATH += boot/include
INCLUDE_PATH += $(HV_OBJDIR)/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) 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 CC ?= gcc
AS ?= as AS ?= as

1
hypervisor/arch/x86/configs/apl-mrb/sos_vm.h Symbolic link
View File

@ -0,0 +1 @@
../sos_vm.h

1
hypervisor/arch/x86/configs/apl-nuc Symbolic link
View File

@ -0,0 +1 @@
nuc6cayh

1
hypervisor/arch/x86/configs/apl-up2/sos_vm.h Symbolic link
View File

@ -0,0 +1 @@
../sos_vm.h

1
hypervisor/arch/x86/configs/dnv-cb2/sos_vm.h Symbolic link
View File

@ -0,0 +1 @@
../sos_vm.h

1
hypervisor/arch/x86/configs/kbl-nuc-i7 Symbolic link
View File

@ -0,0 +1 @@
nuc7i7bnh

1
hypervisor/arch/x86/configs/kbl-nuc-i7.config Symbolic link
View File

@ -0,0 +1 @@
nuc7i7bnh.config

1
hypervisor/arch/x86/configs/nuc6cayh/sos_vm.h Symbolic link
View File

@ -0,0 +1 @@
../sos_vm.h

3
hypervisor/arch/x86/configs/nuc7i7bnh.config Normal file
View File

@ -0,0 +1,3 @@
# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib)
CONFIG_BOARD="NUC7i7BNH"
CONFIG_SERIAL_LEGACY=y

1
hypervisor/arch/x86/configs/nuc7i7bnh/sos_vm.h Symbolic link
View File

@ -0,0 +1 @@
../sos_vm.h

7
hypervisor/arch/x86/configs/default/sos_vm.h → hypervisor/arch/x86/configs/sos_vm.h
View File

@ -3,6 +3,13 @@
* *
* SPDX-License-Identifier: BSD-3-Clause * 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 #ifndef SOS_VM_CONFIG_H
#define SOS_VM_CONFIG_H #define SOS_VM_CONFIG_H