From e67f0eab8e8e79884a4a33fceb3c2f7992be6366 Mon Sep 17 00:00:00 2001
From: Mingqiang Chi <mingqiang.chi@intel.com>
Date: Mon, 10 Jun 2019 16:55:04 +0800
Subject: [PATCH] hv:build virtual platform DM to vp_dm_mod.a

support compiling virtual platform device model layer
to vp_dm_mod.a

Tracked-On: #1842
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
	modified:   Makefile
---
 hypervisor/Makefile | 49 +++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index 256683332..faf63d444 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -24,6 +24,7 @@ LIB_MOD = $(HV_MODDIR)/lib_mod.a
 BOOT_MOD = $(HV_MODDIR)/boot_mod.a
 HW_MOD = $(HV_MODDIR)/hw_mod.a
 VP_BASE_MOD = $(HV_MODDIR)/vp_base_mod.a
+VP_DM_MOD = $(HV_MODDIR)/vp_dm_mod.a
 LIB_DEBUG = $(HV_MODDIR)/libdebug.a
 LIB_RELEASE = $(HV_MODDIR)/librelease.a
 
@@ -238,6 +239,26 @@ VP_BASE_C_SRCS += common/vm_load.c
 VP_BASE_C_SRCS += arch/x86/configs/vmptable.c
 VP_BASE_C_SRCS += arch/x86/configs/$(CONFIG_BOARD)/ve820.c
 
+# virtual platform device model
+VP_DM_C_SRCS += dm/vpic.c
+VP_DM_C_SRCS += dm/vrtc.c
+VP_DM_C_SRCS += dm/vioapic.c
+VP_DM_C_SRCS += dm/vuart.c
+VP_DM_C_SRCS += dm/io_req.c
+VP_DM_C_SRCS += dm/vpci/vdev.c
+VP_DM_C_SRCS += dm/vpci/vpci.c
+VP_DM_C_SRCS += dm/vpci/vhostbridge.c
+VP_DM_C_SRCS += dm/vpci/pci_pt.c
+VP_DM_C_SRCS += dm/vpci/vmsi.c
+VP_DM_C_SRCS += dm/vpci/vmsix.c
+VP_DM_C_SRCS += arch/x86/guest/vlapic.c
+VP_DM_C_SRCS += arch/x86/guest/pm.c
+VP_DM_C_SRCS += arch/x86/guest/assign.c
+VP_DM_C_SRCS += arch/x86/guest/vmx_io.c
+VP_DM_C_SRCS += arch/x86/guest/instr_emul.c
+VP_DM_C_SRCS += arch/x86/guest/vm_reset.c
+VP_DM_C_SRCS += common/ptdev.c
+
 # initilization component
 C_SRCS += arch/x86/init.c
 
@@ -245,29 +266,10 @@ C_SRCS += arch/x86/seed/seed.c
 C_SRCS += arch/x86/seed/seed_abl.c
 C_SRCS += arch/x86/seed/seed_sbl.c
 
-
-C_SRCS += arch/x86/guest/vlapic.c
 C_SRCS += arch/x86/guest/vmcall.c
-C_SRCS += arch/x86/guest/instr_emul.c
-C_SRCS += arch/x86/guest/pm.c
-C_SRCS += arch/x86/guest/assign.c
-C_SRCS += arch/x86/guest/vmx_io.c
 C_SRCS += arch/x86/guest/trusty.c
-C_SRCS += arch/x86/guest/vm_reset.c
 C_SRCS += common/hypercall.c
 C_SRCS += common/trusty_hypercall.c
-C_SRCS += common/ptdev.c
-C_SRCS += dm/vpic.c
-C_SRCS += dm/vrtc.c
-C_SRCS += dm/vioapic.c
-C_SRCS += dm/vuart.c
-C_SRCS += dm/io_req.c
-C_SRCS += dm/vpci/vdev.c
-C_SRCS += dm/vpci/vpci.c
-C_SRCS += dm/vpci/vhostbridge.c
-C_SRCS += dm/vpci/pci_pt.c
-C_SRCS += dm/vpci/vmsi.c
-C_SRCS += dm/vpci/vmsix.c
 
 LIB_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(LIB_C_SRCS))
 LIB_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(LIB_S_SRCS))
@@ -277,7 +279,9 @@ HW_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(HW_C_SRCS))
 HW_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(HW_S_SRCS))
 VP_BASE_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_BASE_C_SRCS))
 VP_BASE_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(VP_BASE_S_SRCS))
+VP_DM_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_DM_C_SRCS))
 C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(C_SRCS))
+
 ifneq ($(CONFIG_RELEASE),y)
 CFLAGS += -DHV_DEBUG -DPROFILING_ON -fno-omit-frame-pointer
 endif
@@ -289,11 +293,13 @@ MOD_DEPS += lib-mod
 MOD_DEPS += boot-mod
 MOD_DEPS += hw-mod
 MOD_DEPS += vp-base-mod
+MOD_DEPS += vp-dm-mod
 MOD_DEPS += lib
 MODULES += $(LIB_MOD)
 MODULES += $(BOOT_MOD)
 MODULES += $(HW_MOD)
 MODULES += $(VP_BASE_MOD)
+MODULES += $(VP_DM_MOD)
 ifeq ($(CONFIG_RELEASE),y)
 MODULES += $(LIB_RELEASE)
 else
@@ -366,7 +372,7 @@ pre_build: $(PRE_BUILD_OBJS)
 .PHONY: header
 header: $(VERSION) $(HV_OBJDIR)/$(HV_CONFIG_H) $(TARGET_ACPI_INFO_HEADER)
 
-.PHONY: lib-mod boot-mod hw-mod vp-base-mod
+.PHONY: lib-mod boot-mod hw-mod vp-base-mod vp-dm-mod
 lib-mod: $(LIB_C_OBJS) $(LIB_S_OBJS)
 	$(AR) $(ARFLAGS) $(LIB_MOD) $(LIB_C_OBJS) $(LIB_S_OBJS)
 boot-mod: $(BOOT_S_OBJS) $(BOOT_C_OBJS)
@@ -375,6 +381,9 @@ hw-mod: $(HW_S_OBJS) $(HW_C_OBJS)
 	$(AR) $(ARFLAGS) $(HW_MOD) $(HW_S_OBJS) $(HW_C_OBJS)
 vp-base-mod: $(VP_BASE_S_OBJS) $(VP_BASE_C_OBJS)
 	$(AR) $(ARFLAGS) $(VP_BASE_MOD) $(VP_BASE_S_OBJS) $(VP_BASE_C_OBJS)
+vp-dm-mod: $(VP_DM_C_OBJS)
+	$(AR) $(ARFLAGS) $(VP_DM_MOD) $(VP_DM_C_OBJS)
+
 .PHONY: lib
 lib: $(SUB_MAKEFILES)