Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use optee-enabled ACRN binary for optee-enabled build #172

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Use optee-enabled ACRN binary for optee-enabled build #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions core/definitions.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,23 @@ KF4SBL_SYMBOLS_ZIP := $(PRODUCT_OUT)/kf4sbl_symbols.zip
FB4SBL_SYMBOLS_ZIP := $(PRODUCT_OUT)/fb4sbl_symbols.zip

ifeq ($(TARGET_BUILD_VARIANT),user)
ifeq ($(TEE),optee)
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 ($(TEE),optee)
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
OPTEE_ELF := $(TOP)/vendor/intel/optee/optee_release_binaries/release/tee.elf
else
OPTEE_BIN := $(TOP)/vendor/intel/optee/optee_release_binaries/debug/tee.elf
OPTEE_ELF := $(TOP)/vendor/intel/optee/optee_release_binaries/debug/tee.elf
endif

# Extra host tools we need built to use our *_from_target_files
Expand Down Expand Up @@ -194,7 +202,7 @@ if [ $(findstring optee,$(TEE) ) ]; then \
rm -rf $(SBL_DIR)/cmdline-tee; \
rm -rf $(SBL_DIR)/tee.elf; \
echo -ne "tee_elf\0" > $(SBL_DIR)/cmdline-tee; \
cp $(OPTEE_BIN) $(SBL_DIR)/tee.elf; \
cp $(OPTEE_ELF) $(SBL_DIR)/tee.elf; \
python3 $(INTEL_PATH_BUILD)/containertool/GenContainer.py create -t MULTIBOOT \
-cl CMD1:$(SBL_DIR)/cmdline-acrn ELF1:$(SBL_DIR)/acrn.32.out CMD2:$(SBL_DIR)/cmdline-kf ELF2:$@ \
CMD3:$(SBL_DIR)/cmdline-tee ELF3:$(SBL_DIR)/tee.elf \
Expand Down
Loading