From 664bc1bace5f7138fc820dca354cc13f32a2e8b8 Mon Sep 17 00:00:00 2001 From: dongshen Date: Mon, 19 Nov 2018 17:18:11 -0800 Subject: [PATCH] HV: Partition mode source code file layout reorg Put partition mode board specific files under partition/$(CONFIG_BOARD)/ Tracked-On: #1852 Signed-off-by: dongshen --- hypervisor/Makefile | 7 ++----- hypervisor/{arch/x86/guest => partition/apl-mrb}/mptable.c | 0 hypervisor/partition/{ => apl-mrb}/vm_description.c | 0 3 files changed, 2 insertions(+), 5 deletions(-) rename hypervisor/{arch/x86/guest => partition/apl-mrb}/mptable.c (100%) rename hypervisor/partition/{ => apl-mrb}/vm_description.c (100%) diff --git a/hypervisor/Makefile b/hypervisor/Makefile index b479fc94a..d574d71fb 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -183,7 +183,8 @@ C_SRCS += dm/hw/pci.c C_SRCS += dm/vpci/core.c C_SRCS += dm/vpci/vpci.c ifeq ($(CONFIG_PARTITION_MODE),y) -C_SRCS += $(wildcard partition/*.c) +C_SRCS += partition/$(CONFIG_BOARD)/mptable.c +C_SRCS += partition/$(CONFIG_BOARD)/vm_description.c C_SRCS += dm/vpci/partition_mode.c C_SRCS += dm/vpci/hostbridge.c C_SRCS += dm/vpci/pci_pt.c @@ -206,10 +207,6 @@ C_SRCS += boot/sbl/abl_seed_parse.c endif endif -ifeq ($(CONFIG_PARTITION_MODE), y) -C_SRCS += arch/x86/guest/mptable.c -endif - # retpoline support ifeq (true, $(shell [ $(GCC_MAJOR) -eq 7 ] && [ $(GCC_MINOR) -ge 3 ] && echo true)) CFLAGS += -mindirect-branch=thunk-extern -mindirect-branch-register diff --git a/hypervisor/arch/x86/guest/mptable.c b/hypervisor/partition/apl-mrb/mptable.c similarity index 100% rename from hypervisor/arch/x86/guest/mptable.c rename to hypervisor/partition/apl-mrb/mptable.c diff --git a/hypervisor/partition/vm_description.c b/hypervisor/partition/apl-mrb/vm_description.c similarity index 100% rename from hypervisor/partition/vm_description.c rename to hypervisor/partition/apl-mrb/vm_description.c