Use optee-enabled ACRN binary for optee-enabled build

Tracked-On: OAM-113418 Signed-off-by: Jiaqing Zhao <[email protected]>
projectceladon · Nov 16, 2023 · 5618b45 · 5618b45
1 parent 83256d0
commit 5618b45
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/core/definitions.mk b/core/definitions.mk
@@ -28,10 +28,24 @@ KF4SBL_SYMBOLS_ZIP := $(PRODUCT_OUT)/kf4sbl_symbols.zip
 FB4SBL_SYMBOLS_ZIP := $(PRODUCT_OUT)/fb4sbl_symbols.zip
 
 ifeq ($(TARGET_BUILD_VARIANT),user)
+ifeq ($(TARGET_USE_OPTEE),true)
+ACRN_BIN := $(TOP)/vendor/intel/acrn/sample_a/acrn.32.out.tee.release
+else
 ACRN_BIN := $(TOP)/vendor/intel/acrn/sample_a/acrn.32.out.release
+endif
+else
+ifeq ($(TARGET_USE_OPTEE),true)
+ACRN_BIN := $(TOP)/vendor/intel/acrn/sample_a/acrn.32.out.tee
 else
 ACRN_BIN := $(TOP)/vendor/intel/acrn/sample_a/acrn.32.out
 endif
+endif
+
+ifeq ($(TARGET_BUILD_VARIANT),user)
+OPTEE_BIN := $(TOP)/vendor/intel/optee/optee_release_binaries/release/tee.elf
+else
+OPTEE_BIN := $(TOP)/vendor/intel/optee/optee_release_binaries/debug/tee.elf
+endif
 
 ifeq ($(TARGET_BUILD_VARIANT),user)
 OPTEE_BIN := $(TOP)/vendor/intel/optee/optee_release_binaries/release/tee.elf