Skip to content

Commit 02bf362

Browse files
mingqiangchiacrnsi
authored andcommitted
hv:build virtual platform trusty to vp_trusty_mod.a
support compiling virtual platform trusty to vp_trusty_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 e67f0ea commit 02bf362

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

hypervisor/Makefile

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ BOOT_MOD = $(HV_MODDIR)/boot_mod.a
2525
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
28+
VP_TRUSTY_MOD = $(HV_MODDIR)/vp_trusty_mod.a
2829
LIB_DEBUG = $(HV_MODDIR)/libdebug.a
2930
LIB_RELEASE = $(HV_MODDIR)/librelease.a
3031

@@ -259,17 +260,18 @@ VP_DM_C_SRCS += arch/x86/guest/instr_emul.c
259260
VP_DM_C_SRCS += arch/x86/guest/vm_reset.c
260261
VP_DM_C_SRCS += common/ptdev.c
261262

263+
# virtual platform trusty
264+
VP_TRUSTY_C_SRCS += arch/x86/guest/trusty.c
265+
VP_TRUSTY_C_SRCS += common/trusty_hypercall.c
266+
VP_TRUSTY_C_SRCS += arch/x86/seed/seed.c
267+
VP_TRUSTY_C_SRCS += arch/x86/seed/seed_abl.c
268+
VP_TRUSTY_C_SRCS += arch/x86/seed/seed_sbl.c
269+
262270
# initilization component
263271
C_SRCS += arch/x86/init.c
264272

265-
C_SRCS += arch/x86/seed/seed.c
266-
C_SRCS += arch/x86/seed/seed_abl.c
267-
C_SRCS += arch/x86/seed/seed_sbl.c
268-
269273
C_SRCS += arch/x86/guest/vmcall.c
270-
C_SRCS += arch/x86/guest/trusty.c
271274
C_SRCS += common/hypercall.c
272-
C_SRCS += common/trusty_hypercall.c
273275

274276
LIB_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(LIB_C_SRCS))
275277
LIB_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(LIB_S_SRCS))
@@ -280,6 +282,7 @@ HW_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(HW_S_SRCS))
280282
VP_BASE_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_BASE_C_SRCS))
281283
VP_BASE_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(VP_BASE_S_SRCS))
282284
VP_DM_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_DM_C_SRCS))
285+
VP_TRUSTY_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_TRUSTY_C_SRCS))
283286
C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(C_SRCS))
284287

285288
ifneq ($(CONFIG_RELEASE),y)
@@ -294,12 +297,14 @@ MOD_DEPS += boot-mod
294297
MOD_DEPS += hw-mod
295298
MOD_DEPS += vp-base-mod
296299
MOD_DEPS += vp-dm-mod
300+
MOD_DEPS += vp-trusty-mod
297301
MOD_DEPS += lib
298302
MODULES += $(LIB_MOD)
299303
MODULES += $(BOOT_MOD)
300304
MODULES += $(HW_MOD)
301305
MODULES += $(VP_BASE_MOD)
302306
MODULES += $(VP_DM_MOD)
307+
MODULES += $(VP_TRUSTY_MOD)
303308
ifeq ($(CONFIG_RELEASE),y)
304309
MODULES += $(LIB_RELEASE)
305310
else
@@ -372,7 +377,7 @@ pre_build: $(PRE_BUILD_OBJS)
372377
.PHONY: header
373378
header: $(VERSION) $(HV_OBJDIR)/$(HV_CONFIG_H) $(TARGET_ACPI_INFO_HEADER)
374379

375-
.PHONY: lib-mod boot-mod hw-mod vp-base-mod vp-dm-mod
380+
.PHONY: lib-mod boot-mod hw-mod vp-base-mod vp-dm-mod vp-trusty-mod
376381
lib-mod: $(LIB_C_OBJS) $(LIB_S_OBJS)
377382
$(AR) $(ARFLAGS) $(LIB_MOD) $(LIB_C_OBJS) $(LIB_S_OBJS)
378383
boot-mod: $(BOOT_S_OBJS) $(BOOT_C_OBJS)
@@ -383,6 +388,8 @@ vp-base-mod: $(VP_BASE_S_OBJS) $(VP_BASE_C_OBJS)
383388
$(AR) $(ARFLAGS) $(VP_BASE_MOD) $(VP_BASE_S_OBJS) $(VP_BASE_C_OBJS)
384389
vp-dm-mod: $(VP_DM_C_OBJS)
385390
$(AR) $(ARFLAGS) $(VP_DM_MOD) $(VP_DM_C_OBJS)
391+
vp-trusty-mod: $(VP_TRUSTY_C_OBJS)
392+
$(AR) $(ARFLAGS) $(VP_TRUSTY_MOD) $(VP_TRUSTY_C_OBJS)
386393

387394
.PHONY: lib
388395
lib: $(SUB_MAKEFILES)

0 commit comments

Comments
 (0)