diff options
| author | Jerome Forissier <jerome.forissier@linaro.org> | 2016-02-05 10:48:36 +0100 |
|---|---|---|
| committer | Jerome Forissier <jerome.forissier@linaro.org> | 2016-02-08 13:30:02 +0100 |
| commit | c042fbefb52822b8f1c681d49e272092edd10b0d (patch) | |
| tree | ac27a272bd0fb7229cd39246a0399f361d1ddd40 /ta | |
| parent | 1aa8bb32c132f0cf3b2cf954b56b40dda1f37cc9 (diff) | |
Introduce CROSS_COMPILE32 and CROSS_COMPILE64
Currently, to build a 64-bit TEE core (as well as mixed 32- and 64-bit
TA libraries, which are automatically enabled in this case), one has to
set too many compiler variables:
$ make PLATFORM=hikey CFG_ARM64_core=y \
CROSS_COMPILE_core=aarch64-linux-gnu- \
CROSS_COMPILE_ta_arm64=aarch64-linux-gnu-
This commit introduces two variables, CROSS_COMPILE32 and
CROSS_COMPILE64. They take appropriate default values, so that the
above line may be simplified as:
$ make PLATFORM=hikey CFG_ARM64_core=y
The change remains compatible with previous builds, i.e., CROSS_COMPILE
can still be used to define the 32-bit compiler because CROSS_COMPILE32
defaults to $(CROSS_COMPILE). Similarly, CROSS_COMPILE_core and
CROSS_COMPILE_ta_arm{32,64} are still used so they may be overridden
too.
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Diffstat (limited to 'ta')
| -rw-r--r-- | ta/mk/ta_dev_kit.mk | 2 | ||||
| -rw-r--r-- | ta/ta.mk | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk index 72d36147..2bada9c8 100644 --- a/ta/mk/ta_dev_kit.mk +++ b/ta/mk/ta_dev_kit.mk @@ -9,8 +9,6 @@ include $(ta-dev-kit-dir)/mk/conf.mk binary := $(BINARY) -CROSS_COMPILE_$(sm) ?= $(CROSS_COMPILE) - ifneq ($O,) out-dir := $O else @@ -5,7 +5,6 @@ sm := $(ta-target) sm-$(sm) := y # Setup compiler for this sub module -CROSS_COMPILE_$(sm) ?= $(CROSS_COMPILE) COMPILER_$(sm) ?= $(COMPILER) include mk/$(COMPILER_$(sm)).mk @@ -116,6 +115,7 @@ $(conf-mk-file-export): $(conf-mk-file) $(q)echo CFG_TA_FLOAT_SUPPORT := $(CFG_TA_FLOAT_SUPPORT) >> $@ $(q)($(foreach v, $(ta-mk-file-export-vars-$(sm-$(@))), \ echo $(v) := $($(v));)) >> $@ + $(q)echo '$(ta-mk-file-export-add-$(sm-$(@)))' | sed 's/_nl_ */\n/g' >> $@ cleanfiles := $(cleanfiles) $(conf-mk-file-export) all: $(conf-mk-file-export) |