Skip to content

Commit 5abca94

Browse files
mingqiangchiacrnsi
authored andcommitted
hv: build virtual platform hypercall to vp_hcall_mod.a
support compiling virtual platform hypercall to vp_hcall_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
1 parent 02bf362 commit 5abca94

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

hypervisor/Makefile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ HW_MOD = $(HV_MODDIR)/hw_mod.a
2626
VP_BASE_MOD = $(HV_MODDIR)/vp_base_mod.a
2727
VP_DM_MOD = $(HV_MODDIR)/vp_dm_mod.a
2828
VP_TRUSTY_MOD = $(HV_MODDIR)/vp_trusty_mod.a
29+
VP_HCALL_MOD = $(HV_MODDIR)/vp_hcall_mod.a
2930
LIB_DEBUG = $(HV_MODDIR)/libdebug.a
3031
LIB_RELEASE = $(HV_MODDIR)/librelease.a
3132

@@ -267,12 +268,13 @@ VP_TRUSTY_C_SRCS += arch/x86/seed/seed.c
267268
VP_TRUSTY_C_SRCS += arch/x86/seed/seed_abl.c
268269
VP_TRUSTY_C_SRCS += arch/x86/seed/seed_sbl.c
269270

271+
# virtual platform hypercall
272+
VP_HCALL_C_SRCS += arch/x86/guest/vmcall.c
273+
VP_HCALL_C_SRCS += common/hypercall.c
274+
270275
# initilization component
271276
C_SRCS += arch/x86/init.c
272277

273-
C_SRCS += arch/x86/guest/vmcall.c
274-
C_SRCS += common/hypercall.c
275-
276278
LIB_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(LIB_C_SRCS))
277279
LIB_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(LIB_S_SRCS))
278280
BOOT_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(BOOT_C_SRCS))
@@ -283,6 +285,7 @@ VP_BASE_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_BASE_C_SRCS))
283285
VP_BASE_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(VP_BASE_S_SRCS))
284286
VP_DM_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_DM_C_SRCS))
285287
VP_TRUSTY_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_TRUSTY_C_SRCS))
288+
VP_HCALL_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_HCALL_C_SRCS))
286289
C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(C_SRCS))
287290

288291
ifneq ($(CONFIG_RELEASE),y)
@@ -298,13 +301,15 @@ MOD_DEPS += hw-mod
298301
MOD_DEPS += vp-base-mod
299302
MOD_DEPS += vp-dm-mod
300303
MOD_DEPS += vp-trusty-mod
304+
MOD_DEPS += vp-hcall-mod
301305
MOD_DEPS += lib
302306
MODULES += $(LIB_MOD)
303307
MODULES += $(BOOT_MOD)
304308
MODULES += $(HW_MOD)
305309
MODULES += $(VP_BASE_MOD)
306310
MODULES += $(VP_DM_MOD)
307311
MODULES += $(VP_TRUSTY_MOD)
312+
MODULES += $(VP_HCALL_MOD)
308313
ifeq ($(CONFIG_RELEASE),y)
309314
MODULES += $(LIB_RELEASE)
310315
else
@@ -377,7 +382,7 @@ pre_build: $(PRE_BUILD_OBJS)
377382
.PHONY: header
378383
header: $(VERSION) $(HV_OBJDIR)/$(HV_CONFIG_H) $(TARGET_ACPI_INFO_HEADER)
379384

380-
.PHONY: lib-mod boot-mod hw-mod vp-base-mod vp-dm-mod vp-trusty-mod
385+
.PHONY: lib-mod boot-mod hw-mod vp-base-mod vp-dm-mod vp-trusty-mod vp-hcall-mod
381386
lib-mod: $(LIB_C_OBJS) $(LIB_S_OBJS)
382387
$(AR) $(ARFLAGS) $(LIB_MOD) $(LIB_C_OBJS) $(LIB_S_OBJS)
383388
boot-mod: $(BOOT_S_OBJS) $(BOOT_C_OBJS)
@@ -390,7 +395,8 @@ vp-dm-mod: $(VP_DM_C_OBJS)
390395
$(AR) $(ARFLAGS) $(VP_DM_MOD) $(VP_DM_C_OBJS)
391396
vp-trusty-mod: $(VP_TRUSTY_C_OBJS)
392397
$(AR) $(ARFLAGS) $(VP_TRUSTY_MOD) $(VP_TRUSTY_C_OBJS)
393-
398+
vp-hcall-mod: $(VP_HCALL_C_OBJS)
399+
$(AR) $(ARFLAGS) $(VP_HCALL_MOD) $(VP_HCALL_C_OBJS)
394400
.PHONY: lib
395401
lib: $(SUB_MAKEFILES)
396402

0 commit comments

Comments
 (0)