package/optee-test: use the OPTEE_OS_SDK variable
The optee-os package was recently changed to provide the OPTEE_OS_SDK to allow other packages to locate the OP-TEE Trusted Application SDK, so let's use this new variable in the optee-test package. Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> [Thomas: use the new variable name, rework commit log] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
ca34a3ed25
commit
259ba88cad
@ -11,12 +11,7 @@ OPTEE_TEST_LICENSE_FILES = LICENSE.md
|
||||
|
||||
OPTEE_TEST_DEPENDENCIES = optee-client optee-os
|
||||
|
||||
ifeq ($(BR2_aarch64),y)
|
||||
OPTEE_TEST_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64
|
||||
else ifeq ($(BR2_arm),y)
|
||||
OPTEE_TEST_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32
|
||||
endif
|
||||
OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_TEST_SDK)
|
||||
OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_SDK)
|
||||
|
||||
# Trusted Application are not built from CMake due to ta_dev_kit
|
||||
# dependencies. We must build and install them on target.
|
||||
@ -24,7 +19,7 @@ define OPTEE_TEST_BUILD_TAS
|
||||
$(foreach f,$(wildcard $(@D)/ta/*/Makefile), \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
|
||||
TA_DEV_KIT_DIR=$(OPTEE_TEST_SDK) \
|
||||
TA_DEV_KIT_DIR=$(OPTEE_OS_SDK) \
|
||||
-C $(dir $f) all
|
||||
)
|
||||
endef
|
||||
|
Loading…
Reference in New Issue
Block a user