Skip to content

Commit

Permalink
br-ext: optee_test: use ta/Makefile.gmake instead of enumerating TAs
Browse files Browse the repository at this point in the history
Invoke the main TA makefile instead of enumerating and building all TAs
unconditionally, in order to properly deal with dependencies and
configuration-specific aspects such as:
 - os_test depends on os_test_lib
 - sdp_basic does not need to be built unless CFG_SECURE_DATA_PATH=y

Depends on optee_test commit xxxxxxxxxxxx ("ta: buildroot: preserve
ta/Makefile as ta/Makefile.gmake") [1].

Link: [1] OP-TEE/optee_test@xxxxxxxxxxxx
Signed-off-by: Jerome Forissier <jerome@forissier.org>
  • Loading branch information
jforissier committed Oct 16, 2019
1 parent 10bb03b commit 1b7c90c
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions br-ext/package/optee_test/optee_test.mk
Expand Up @@ -8,13 +8,9 @@ OPTEE_TEST_SDK = $(BR2_PACKAGE_OPTEE_TEST_SDK)
OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_TEST_SDK)

define OPTEE_TEST_BUILD_TAS
@for f in $(@D)/ta/*/Makefile; \
do \
echo Building $$f && \
$(MAKE) CROSS_COMPILE="$(shell echo $(BR2_PACKAGE_OPTEE_TEST_CROSS_COMPILE))" \
O=out TA_DEV_KIT_DIR=$(OPTEE_TEST_SDK) \
$(TARGET_CONFIGURE_OPTS) -C $${f%/*} all; \
done
$(TARGET_CONFIGURE_OPTS) -C $(@D)/ta -f $(@D)/ta/Makefile.gmake
endef

define OPTEE_TEST_INSTALL_TAS
Expand Down

0 comments on commit 1b7c90c

Please sign in to comment.