@@ -25,6 +25,7 @@ BOOT_MOD = $(HV_MODDIR)/boot_mod.a
25
25
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
+ VP_TRUSTY_MOD = $(HV_MODDIR ) /vp_trusty_mod.a
28
29
LIB_DEBUG = $(HV_MODDIR ) /libdebug.a
29
30
LIB_RELEASE = $(HV_MODDIR ) /librelease.a
30
31
@@ -259,17 +260,18 @@ VP_DM_C_SRCS += arch/x86/guest/instr_emul.c
259
260
VP_DM_C_SRCS += arch/x86/guest/vm_reset.c
260
261
VP_DM_C_SRCS += common/ptdev.c
261
262
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
+
262
270
# initilization component
263
271
C_SRCS += arch/x86/init.c
264
272
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
-
269
273
C_SRCS += arch/x86/guest/vmcall.c
270
- C_SRCS += arch/x86/guest/trusty.c
271
274
C_SRCS += common/hypercall.c
272
- C_SRCS += common/trusty_hypercall.c
273
275
274
276
LIB_C_OBJS := $(patsubst % .c,$(HV_OBJDIR ) /% .o,$(LIB_C_SRCS ) )
275
277
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))
280
282
VP_BASE_C_OBJS := $(patsubst % .c,$(HV_OBJDIR ) /% .o,$(VP_BASE_C_SRCS ) )
281
283
VP_BASE_S_OBJS := $(patsubst % .S,$(HV_OBJDIR ) /% .o,$(VP_BASE_S_SRCS ) )
282
284
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 ) )
283
286
C_OBJS := $(patsubst % .c,$(HV_OBJDIR ) /% .o,$(C_SRCS ) )
284
287
285
288
ifneq ($(CONFIG_RELEASE ) ,y)
@@ -294,12 +297,14 @@ MOD_DEPS += boot-mod
294
297
MOD_DEPS += hw-mod
295
298
MOD_DEPS += vp-base-mod
296
299
MOD_DEPS += vp-dm-mod
300
+ MOD_DEPS += vp-trusty-mod
297
301
MOD_DEPS += lib
298
302
MODULES += $(LIB_MOD )
299
303
MODULES += $(BOOT_MOD )
300
304
MODULES += $(HW_MOD )
301
305
MODULES += $(VP_BASE_MOD )
302
306
MODULES += $(VP_DM_MOD )
307
+ MODULES += $(VP_TRUSTY_MOD )
303
308
ifeq ($(CONFIG_RELEASE ) ,y)
304
309
MODULES += $(LIB_RELEASE )
305
310
else
@@ -372,7 +377,7 @@ pre_build: $(PRE_BUILD_OBJS)
372
377
.PHONY : header
373
378
header : $(VERSION ) $(HV_OBJDIR ) /$(HV_CONFIG_H ) $(TARGET_ACPI_INFO_HEADER )
374
379
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
376
381
lib-mod : $(LIB_C_OBJS ) $(LIB_S_OBJS )
377
382
$(AR ) $(ARFLAGS ) $(LIB_MOD ) $(LIB_C_OBJS ) $(LIB_S_OBJS )
378
383
boot-mod : $(BOOT_S_OBJS ) $(BOOT_C_OBJS )
@@ -383,6 +388,8 @@ vp-base-mod: $(VP_BASE_S_OBJS) $(VP_BASE_C_OBJS)
383
388
$(AR ) $(ARFLAGS ) $(VP_BASE_MOD ) $(VP_BASE_S_OBJS ) $(VP_BASE_C_OBJS )
384
389
vp-dm-mod : $(VP_DM_C_OBJS )
385
390
$(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 )
386
393
387
394
.PHONY : lib
388
395
lib : $(SUB_MAKEFILES )
0 commit comments