Skip to content

Commit 99c587d

Browse files
committed
build: support build TEE wg with 'TEE_WG=1',if no TEE_WG=1, build TEE without wg default.
Signed-off-by: guibing <guibing@nucleisys.com>
1 parent 8f3f6e4 commit 99c587d

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ else
4242
XLEN := 64
4343
endif
4444

45+
TEE_WG ?=
46+
ifeq ($(TEE_WG), 1)
47+
TEE_WG := 1
48+
endif
49+
4550
srcdir := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
4651
srcdir := $(srcdir:/=)
4752
wrkdir_root := $(CURDIR)/work
@@ -261,7 +266,7 @@ help:
261266

262267

263268
$(target_gcc): $(buildroot_srcdir) $(buildroot_initramfs_wrkdir)/.config $(buildroot_initramfs_config)
264-
$(MAKE) -C $(buildroot_srcdir) RISCV=$(RISCV) O=$(buildroot_initramfs_wrkdir) toolchain
269+
$(MAKE) -C $(buildroot_srcdir) RISCV=$(RISCV) O=$(buildroot_initramfs_wrkdir) toolchain -j1
265270

266271
$(wrkdir):
267272
mkdir -p $@
@@ -380,7 +385,7 @@ opensbi: $(target_gcc) $(opensbi_plat_deps)
380385
PLATFORM_RISCV_ABI=$(ABI) PLATFORM_RISCV_ISA=$(ISA) PLATFORM_RISCV_XLEN=$(XLEN) \
381386
PLATFORM=generic FW_TEXT_START=$(FW_TEXT_START) FW_OPTEE_SHMEM_BASE=$(OPTEE_OS_SHMEM_START) \
382387
FW_OPTEE_SHMEM_SIZE=$(OPTEE_OS_SHMEM_SIZE) FW_OPTEE_TZDRAM_BASE=$(OPTEE_OS_TZDRAM_START) \
383-
FW_OPTEE_TZDRAM_SIZE=$(OPTEE_OS_TZDRAM_SIZE) CFG_WITH_VFP=y
388+
FW_OPTEE_TZDRAM_SIZE=$(OPTEE_OS_TZDRAM_SIZE) CFG_WITH_VFP=y ENABLE_TEE_WG=$(TEE_WG)
384389

385390
# internal usage for xlspike, deprecated
386391
$(opensbi_payload): $(opensbi_srcdir) $(vmlinux_sim_bin) $(platform_sim_dtb) $(opensbi_plat_deps)
@@ -541,7 +546,7 @@ endif
541546
KERNEL_BIN=$(boot_uimage_lz4) INITRD_BIN=$(boot_uinitrd_lz4) CONFIG_MK=$(freeloader_confmk) \
542547
CORE1_APP_BIN=$(CORE1_APP_BIN) CORE2_APP_BIN=$(CORE2_APP_BIN) CORE3_APP_BIN=$(CORE3_APP_BIN) \
543548
CORE4_APP_BIN=$(CORE4_APP_BIN) CORE5_APP_BIN=$(CORE5_APP_BIN) CORE6_APP_BIN=$(CORE6_APP_BIN) \
544-
CORE7_APP_BIN=$(CORE7_APP_BIN) OPTEEOS_BIN=$(optee_os_bin)
549+
CORE7_APP_BIN=$(CORE7_APP_BIN) OPTEEOS_BIN=$(optee_os_bin) ENABLE_TEE_WG=$(TEE_WG)
545550

546551
upload_freeloader: $(freeloader_elf)
547552
$(target_gdb) $< -ex "set remotetimeout 240" \

0 commit comments

Comments
 (0)