@@ -26,6 +26,7 @@ HW_MOD = $(HV_MODDIR)/hw_mod.a
26
26
VP_BASE_MOD = $(HV_MODDIR ) /vp_base_mod.a
27
27
VP_DM_MOD = $(HV_MODDIR ) /vp_dm_mod.a
28
28
VP_TRUSTY_MOD = $(HV_MODDIR ) /vp_trusty_mod.a
29
+ VP_HCALL_MOD = $(HV_MODDIR ) /vp_hcall_mod.a
29
30
LIB_DEBUG = $(HV_MODDIR ) /libdebug.a
30
31
LIB_RELEASE = $(HV_MODDIR ) /librelease.a
31
32
@@ -267,12 +268,13 @@ VP_TRUSTY_C_SRCS += arch/x86/seed/seed.c
267
268
VP_TRUSTY_C_SRCS += arch/x86/seed/seed_abl.c
268
269
VP_TRUSTY_C_SRCS += arch/x86/seed/seed_sbl.c
269
270
271
+ # virtual platform hypercall
272
+ VP_HCALL_C_SRCS += arch/x86/guest/vmcall.c
273
+ VP_HCALL_C_SRCS += common/hypercall.c
274
+
270
275
# initilization component
271
276
C_SRCS += arch/x86/init.c
272
277
273
- C_SRCS += arch/x86/guest/vmcall.c
274
- C_SRCS += common/hypercall.c
275
-
276
278
LIB_C_OBJS := $(patsubst % .c,$(HV_OBJDIR ) /% .o,$(LIB_C_SRCS ) )
277
279
LIB_S_OBJS := $(patsubst % .S,$(HV_OBJDIR ) /% .o,$(LIB_S_SRCS ) )
278
280
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))
283
285
VP_BASE_S_OBJS := $(patsubst % .S,$(HV_OBJDIR ) /% .o,$(VP_BASE_S_SRCS ) )
284
286
VP_DM_C_OBJS := $(patsubst % .c,$(HV_OBJDIR ) /% .o,$(VP_DM_C_SRCS ) )
285
287
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 ) )
286
289
C_OBJS := $(patsubst % .c,$(HV_OBJDIR ) /% .o,$(C_SRCS ) )
287
290
288
291
ifneq ($(CONFIG_RELEASE ) ,y)
@@ -298,13 +301,15 @@ MOD_DEPS += hw-mod
298
301
MOD_DEPS += vp-base-mod
299
302
MOD_DEPS += vp-dm-mod
300
303
MOD_DEPS += vp-trusty-mod
304
+ MOD_DEPS += vp-hcall-mod
301
305
MOD_DEPS += lib
302
306
MODULES += $(LIB_MOD )
303
307
MODULES += $(BOOT_MOD )
304
308
MODULES += $(HW_MOD )
305
309
MODULES += $(VP_BASE_MOD )
306
310
MODULES += $(VP_DM_MOD )
307
311
MODULES += $(VP_TRUSTY_MOD )
312
+ MODULES += $(VP_HCALL_MOD )
308
313
ifeq ($(CONFIG_RELEASE ) ,y)
309
314
MODULES += $(LIB_RELEASE )
310
315
else
@@ -377,7 +382,7 @@ pre_build: $(PRE_BUILD_OBJS)
377
382
.PHONY : header
378
383
header : $(VERSION ) $(HV_OBJDIR ) /$(HV_CONFIG_H ) $(TARGET_ACPI_INFO_HEADER )
379
384
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
381
386
lib-mod : $(LIB_C_OBJS ) $(LIB_S_OBJS )
382
387
$(AR ) $(ARFLAGS ) $(LIB_MOD ) $(LIB_C_OBJS ) $(LIB_S_OBJS )
383
388
boot-mod : $(BOOT_S_OBJS ) $(BOOT_C_OBJS )
@@ -390,7 +395,8 @@ vp-dm-mod: $(VP_DM_C_OBJS)
390
395
$(AR ) $(ARFLAGS ) $(VP_DM_MOD ) $(VP_DM_C_OBJS )
391
396
vp-trusty-mod : $(VP_TRUSTY_C_OBJS )
392
397
$(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 )
394
400
.PHONY : lib
395
401
lib : $(SUB_MAKEFILES )
396
402
0 commit comments