From 65916b73768e52a4937672384f6ba10e0679326e Mon Sep 17 00:00:00 2001 From: Jiaqing Zhao Date: Thu, 9 Nov 2023 08:01:45 +0000 Subject: [PATCH] Use acrn release binary in user build Tracked-On: OAM-113406 Signed-off-by: Jiaqing Zhao --- core/definitions.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/definitions.mk b/core/definitions.mk index f2de5f1..8389dc9 100755 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -27,6 +27,12 @@ IASL := $(INTEL_PATH_BUILD)/acpi-tools/linux64/bin/iasl KF4SBL_SYMBOLS_ZIP := $(PRODUCT_OUT)/kf4sbl_symbols.zip FB4SBL_SYMBOLS_ZIP := $(PRODUCT_OUT)/fb4sbl_symbols.zip +ifeq ($(TARGET_BUILD_VARIANT),user) +ACRN_BIN := $(TOP)/vendor/intel/acrn/sample_a/acrn.32.out.release +else +ACRN_BIN := $(TOP)/vendor/intel/acrn/sample_a/acrn.32.out +endif + # Extra host tools we need built to use our *_from_target_files # or sign_target_files_* scripts INTEL_OTATOOLS := \ @@ -177,7 +183,7 @@ if [ $(findstring kf4sbl,$(PRIVATE_MODULE) ) ]; then \ rm -rf $(SBL_DIR)/acrn.32.out; \ echo -ne "serail_baseaddr=0x3f8 serail_type=1 serail_regwidth=1\0" > $(SBL_DIR)/cmdline-acrn; \ echo -ne "kernelflinger\0" > $(SBL_DIR)/cmdline-kf; \ - cp $(TOP)/vendor/intel/acrn/sample_a/acrn.32.out $(SBL_DIR)/acrn.32.out; \ + cp $(ACRN_BIN) $(SBL_DIR)/acrn.32.out; \ if [ $(findstring optee,$(TEE) ) ]; then \ rm -rf $(SBL_DIR)/cmdline-tee; \ rm -rf $(SBL_DIR)/tee.elf; \