diff options
| author | Jerome Forissier <jerome.forissier@linaro.org> | 2014-12-16 19:23:24 +0100 |
|---|---|---|
| committer | Jerome Forissier <jerome.forissier@linaro.org> | 2015-01-05 18:51:25 +0100 |
| commit | 3bce5ba118caf537ed5788eb46500eaadbe795ba (patch) | |
| tree | 38319a204e1816ca6fd8215be299fc5fcb0baa07 /ta | |
| parent | a3911433960aa2152c4d71e539616975a4af32e5 (diff) | |
ta_dev_kit.mk: get platform-specific flags from platform_flags.mk
Platform-specific flags that apply to user-mode code are moved from
from core/arch/$(ARCH)/plat-$(PLATFORM)/conf.mk to a new file:
core/arch/$(ARCH)/plat-$(PLATFORM)/platform_flags.mk.
This file is used by ta/mk/ta_dev_kit.mk so that the Trusted Applications
are built with the same flags used when building the user-mode TEE code.
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Diffstat (limited to 'ta')
| -rw-r--r-- | ta/mk/ta_dev_kit.mk | 13 | ||||
| -rw-r--r-- | ta/ta.mk | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk index 5a87955..b36ce07 100644 --- a/ta/mk/ta_dev_kit.mk +++ b/ta/mk/ta_dev_kit.mk @@ -25,17 +25,12 @@ q := cmd-echo := echo endif -cflags$(sm) += -fno-short-enums -fpie -mfloat-abi=soft -cppflags$(sm) += -I. -I$(ta-dev-kit-dir)/include +-include $(ta-dev-kit-dir)/mk/platform_flags.mk -ifeq ($(DEBUG),1) -cflags$(sm) += -O0 -else -cflags$(sm) += -Os -endif -cflags$(sm) += -g -g3 -aflags$(sm) += -g -g3 +aflags$(sm) += $(platform-aflags) $(user_ta-platform-aflags) +cflags$(sm) += $(platform-cflags) $(user_ta-platform-cflags) +cppflags$(sm) += -I. -I$(ta-dev-kit-dir)/include libdirs += $(ta-dev-kit-dir)/lib libnames += utils mpa utee @@ -1,4 +1,5 @@ include mk/cleanvars.mk +include core/arch/$(ARCH)/plat-$(PLATFORM)/platform_flags.mk # Set current submodule (used for module specific flags compile result etc) sm := user_ta @@ -52,8 +53,10 @@ $(foreach f, $(libfiles), \ # Copy .mk files ta-mkfiles = mk/compile.mk mk/subdir.mk mk/gcc.mk \ + $(wildcard core/arch/$(ARCH)/plat-$(PLATFORM)/platform_flags.mk) \ $(wildcard ta/arch/$(ARCH)/link.mk) \ ta/mk/ta_dev_kit.mk + $(foreach f, $(ta-mkfiles), \ $(eval $(call copy-file, $(f), $(out-dir)/export-user_ta/mk))) |