mk/aosp_optee.mk: Allow building OPTEE_BIN with early TAs in one shot

This change adds OPTEE_TA_DEV_KIT_MK target to replace OPTEE_BIN
target in TA build process. It helps to build OPTEE_BIN with
ea

mk/aosp_optee.mk: Allow building OPTEE_BIN with early TAs in one shot

This change adds OPTEE_TA_DEV_KIT_MK target to replace OPTEE_BIN
target in TA build process. It helps to build OPTEE_BIN with
early TAs in one shot since the cyclic dependency between TAs and
OPTEE_BIN is removed. It also allows to build TA with a preferred
TA_TARGET that is not included in the CFG_USER_TA_TARGETS when
building OPTEE_BIN. An AOSP common module for TAs in stripped elf
format is added to be referred as early TA files when building
OPTEE_BIN. For example, we can setup dependency and use the argument
below to build OPTEE_BIN with an early TA.

EARLY_TA_PATHS=$(abspath $(PRODUCT_OUT))/unsigned/<ta_uuid>.ta.unsigned

Signed-off-by: Tadd Kao <tadd.kao@mediatek.com>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>

show more ...

mk/aosp_optee.mk: fix build dependency between a TA and its libraries

The LOCAL_REQUIRED_MODULES proposed by the commit [1] creates the
dependency for the specified modules and product to make sure

mk/aosp_optee.mk: fix build dependency between a TA and its libraries

The LOCAL_REQUIRED_MODULES proposed by the commit [1] creates the
dependency for the specified modules and product to make sure they are
installed to the product image. But it doesn't create the dependency
between a TA and its libraries for build process to correctly link them.
Add the dependency back and change the depended file to the result file
in the intermediate directory instead of the installation directory.

Fixes: fb66b364b5d2 ("mk/aosp_optee.mk: fix build dependency for static libraries")
Signed-off-by: Tadd Kao <tadd.kao@mediatek.com>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

mk/aosp_optee.mk: allow building ta with specified target architecture

Introduce $(local_optee_ta_target) to specify the target architecture
of the built TA in aosp build environment.

Signed-off-by

mk/aosp_optee.mk: allow building ta with specified target architecture

Introduce $(local_optee_ta_target) to specify the target architecture
of the built TA in aosp build environment.

Signed-off-by: Tadd Kao <tadd.kao@mediatek.com>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

mk/aosp_optee.mk: fix build dependency for static libraries

The dependency set by $(local_module_deps) needs different file paths
for static libraries due to the commit [1]. Use the make variable,
L

mk/aosp_optee.mk: fix build dependency for static libraries

The dependency set by $(local_module_deps) needs different file paths
for static libraries due to the commit [1]. Use the make variable,
LOCAL_REQUIRED_MODULES [2], to properly set the dependencies for TA
to link with static and shared libraries.

Fixes: d1b003febbcd ("mk: Support user static lib for aosp build")
Link: https://android.googlesource.com/platform/build/+/refs/heads/android13-release/core/build-system.html#704 [2]
Signed-off-by: Tadd Kao <tadd.kao@mediatek.com>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

mk: Support user static lib for aosp build

The aosp build environment don't allow writing to source folder, move
the $(libname).a in current folder to $(out-link-dir$(sm)). And since
static librarie

mk: Support user static lib for aosp build

The aosp build environment don't allow writing to source folder, move
the $(libname).a in current folder to $(out-link-dir$(sm)). And since
static libraries are not needed for runtime, set the LOCAL_MODULE_CLASS
to STATIC_LIBRARIES to avoid installing by aosp build.

Signed-off-by: Tadd Kao <tadd.kao@mediatek.com>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

mk/aosp_optee.mk: Provide the ability to set CROSS_COMPILE* variables

Provide the ability to set CROSS_COMPILE32/64 for AOSP build,
since those may differ among different compilers.

Acked-by: Jerom

mk/aosp_optee.mk: Provide the ability to set CROSS_COMPILE* variables

Provide the ability to set CROSS_COMPILE32/64 for AOSP build,
since those may differ among different compilers.

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Andrii Chepurnyi <andrii_chepurnyi@epam.com>

show more ...

mk/aosp_optee.mk: introduce OPTEE_EXTRA_TA_FLAGS variable

Introduce OPTEE_EXTRA_TA_FLAGS variable to be able to pass
additional variables/flags in case of TA AOSP build.

Acked-by: Jerome Forissier

mk/aosp_optee.mk: introduce OPTEE_EXTRA_TA_FLAGS variable

Introduce OPTEE_EXTRA_TA_FLAGS variable to be able to pass
additional variables/flags in case of TA AOSP build.

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Andrii Chepurnyi <andrii_chepurnyi@epam.com>

show more ...

mk/aosp_optee.mk: remove cp -u option

AOSP's Toybox's version of cp doesn't support the -u option

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Signed-off-by: Yongqin Liu <yongqin.liu@linar

mk/aosp_optee.mk: remove cp -u option

AOSP's Toybox's version of cp doesn't support the -u option

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

show more ...

Introduce CFG_USER_TA_TARGETS to select user mode architecture(s)

This change introduces CFG_USER_TA_TARGETS to allow the configuration
directives to select the architectures for which userspace TA

Introduce CFG_USER_TA_TARGETS to select user mode architecture(s)

This change introduces CFG_USER_TA_TARGETS to allow the configuration
directives to select the architectures for which userspace TA and TA
libraries shall be built. The only use case for the moment is to be able
to build only 32 or 64-bit libraries and TAs when the platform would
otherwise support both 32 and 64-bit. See the example below.

If CFG_USER_TA_TARGETS is undefined or empty, all the architectures
supported by the platform are built.

If CFG_USER_TA_TARGETS contains an unsupported value, the build will
report an error.

Examples:

$ make PLATFORM=hikey CFG_ARM64_core=y
# Builds both 32 and 64-bit userspace
$ make PLATFORM=hikey CFG_ARM64_core=y \
CFG_USER_TA_TARGETS="ta_arm32 ta_arm64"
# Same as above
$ make PLATFORM=hikey CFG_ARM64_core=y CFG_USER_TA_TARGETS=ta_arm32
# Builds only 32-bit userspace

Suggested-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>

show more ...

mk/aosp_optee.mk: use prebuilt make command

The host side make command is disallowed by the Android build system on
AOSP master [1]. Using it anyway causes the following build error:

"make" is no

mk/aosp_optee.mk: use prebuilt make command

The host side make command is disallowed by the Android build system on
AOSP master [1]. Using it anyway causes the following build error:

"make" is not allowed to be used.

See [2] for more information.

Link: [1] https://android-review.googlesource.com/c/platform/build/soong/+/796565
Link: [2] https://android.googlesource.com/platform/build/+/master/Changes.md#PATH_Tools

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

show more ...

mk/aosp_optee.mk: workaround for PHONY target limitation with AOSP master

There are some limitations on PHONY target introduced into the AOSP master [1],
and the change here is to remove the use of

mk/aosp_optee.mk: workaround for PHONY target limitation with AOSP master

There are some limitations on PHONY target introduced into the AOSP master [1],
and the change here is to remove the use of PHONY target for BUILD_OPTEE_OS
definition, and to define OPTEE_BIN with relative path in aosp workspace
instead of absolute path.

Link [1]: https://android.googlesource.com/platform/build/+/HEAD/Changes.md#phony_targets

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

show more ...

aosp_optee.mk: Fix compilation for build outside of source

Trying to specify Android build location outside of souce directory's
default 'out' using OUT_DIR_COMMON_BASE env variable, results in erro

aosp_optee.mk: Fix compilation for build outside of source

Trying to specify Android build location outside of souce directory's
default 'out' using OUT_DIR_COMMON_BASE env variable, results in errors
like
"...
<built-in>:1:10: fatal error: 'conf.h' file not found
"

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org> (hikey620)
Acked-by: Victor Chong <victor.chong@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
[jf: wrap commit text]
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

show more ...

mk/aosp_optee.mk: move ta files to vendor partition

to make it work with Treble enabled builds

Acked-by: Victor Chong <victor.chong@linaro.org>
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

aosp_optee.mk: allow dependency builds for TAs

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissi

aosp_optee.mk: allow dependency builds for TAs

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

show more ...

mk/aosp_optee.mk: define OPTEE_BIN for path of tee.bin

so that other android projects could use OPTEE_BIN
as the dependency instead of the old BUILD_OPTEE_OS target.

Ths is workaround for the probl

mk/aosp_optee.mk: define OPTEE_BIN for path of tee.bin

so that other android projects could use OPTEE_BIN
as the dependency instead of the old BUILD_OPTEE_OS target.

Ths is workaround for the problem with following with aosp master:
external/optee_test/Android.mk: error: xtest: LOCAL_ADDITIONAL_DEPENDENCIES must only contain paths (not module names)

Reviewed-by: Victor Chong <victor.chong@linaro.org>

Tested by: Victor Chong <victor.chong@linaro.org> (hikey aosp)
Tested-by: Yongqin Liu <yongqin.liu@linaro.org> (hikey aosp master)

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

show more ...

mk: aosp_optee.mk: Fix check for 2nd toolchain

Set CROSS_COMPILE32 and append to CROSS_COMPILE_LINE if
$($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX) is NOT empty.

Signed-off-by: Victor Chong <vict

mk: aosp_optee.mk: Fix check for 2nd toolchain

Set CROSS_COMPILE32 and append to CROSS_COMPILE_LINE if
$($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX) is NOT empty.

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Acked-by: Yongqin Liu <yongqin.liu@linaro.org>

show more ...

mk/aosp_optee.mk: Allow extra flags for aosp builds

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
[jf: rebase on top of master]
Signed

mk/aosp_optee.mk: Allow extra flags for aosp builds

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
[jf: rebase on top of master]
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

show more ...

build: add PLATFORM_FLAVOR for BUILD_OPTEE_OS

fix build error:
In file included from core/arch/arm/kernel/thread.c:29:0:
core/arch/arm/plat-aquila/./platform_config.h:51:2: error: #error "Unknown pl

build: add PLATFORM_FLAVOR for BUILD_OPTEE_OS

fix build error:
In file included from core/arch/arm/kernel/thread.c:29:0:
core/arch/arm/plat-aquila/./platform_config.h:51:2: error: #error "Unknown platform flavor"
#error "Unknown platform flavor"

Signed-off-by: Zhizhou Zhang <zhizhou.zh@gmail.com>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

show more ...

asop: Add common Makefile for core and TA's

With this fix it's sufficient to add the following to the respective
Android.mk files in the TA directories:

LOCAL_PATH := $(call my-dir)
local_modul

asop: Add common Makefile for core and TA's

With this fix it's sufficient to add the following to the respective
Android.mk files in the TA directories:

LOCAL_PATH := $(call my-dir)
local_module := 11111111-2222-3333-4444444444444444.ta
include $(BUILT_OPTEE_MK)

Where BUILT_OPTEE_MK is the variant pointing to this aosp_optee.mk, which
has been set in the device.mk for a particular platform.

Doing so gives us the ability to control where the TA files will be
installed, where the intermediates will be generated, and other things
in a single place.

The contents contained in this mk file is mainly related to OP-TEE
and do normally not need to be modified, except when the OP-TEE team
wants to change some behavior. This is why we put this mk file here
instead of putting it into the platform device config repository.

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

show more ...