diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2015-03-19 15:00:00 +0100 |
|---|---|---|
| committer | Jens Wiklander <jens.wiklander@linaro.org> | 2015-03-31 17:15:40 +0200 |
| commit | 153c4954e7f0d958428b863acc528e2cad9057ad (patch) | |
| tree | c2acbafa3900ca63ad8bfb0f5c069a745b4edff7 /ta | |
| parent | db886a7f9ab74a374b266638b480fbd872bb97be (diff) | |
core: split arm32.h
Splits arm32.h into one ARM generic arm.h and one ARM32 specific arm32.h.
arm32.h should not be included directly, arm.h should be included instead.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Diffstat (limited to 'ta')
| -rw-r--r-- | ta/arch/arm32/arm32.mk | 6 | ||||
| -rw-r--r-- | ta/mk/ta_dev_kit.mk | 2 | ||||
| -rw-r--r-- | ta/ta.mk | 13 |
3 files changed, 21 insertions, 0 deletions
diff --git a/ta/arch/arm32/arm32.mk b/ta/arch/arm32/arm32.mk new file mode 100644 index 00000000..40a25486 --- /dev/null +++ b/ta/arch/arm32/arm32.mk @@ -0,0 +1,6 @@ +ifeq ($(CFG_ARM64_user_ta),y) +user_ta-platform-cppflags += -DARM64=1 +endif +ifeq ($(CFG_ARM32_user_ta),y) +user_ta-platform-cppflags += -DARM32=1 +endif diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk index b36ce076..37265da1 100644 --- a/ta/mk/ta_dev_kit.mk +++ b/ta/mk/ta_dev_kit.mk @@ -32,6 +32,8 @@ cflags$(sm) += $(platform-cflags) $(user_ta-platform-cflags) cppflags$(sm) += -I. -I$(ta-dev-kit-dir)/include +include $(ta-dev-kit-dir)/mk/arch.mk + libdirs += $(ta-dev-kit-dir)/lib libnames += utils mpa utee libdeps += $(ta-dev-kit-dir)/lib/libutils.a @@ -9,6 +9,8 @@ CROSS_COMPILE_$(sm) ?= $(CROSS_COMPILE) COMPILER_$(sm) ?= $(COMPILER) include mk/$(COMPILER_$(sm)).mk +include ta/arch/$(ARCH)/$(ARCH).mk + cppflags$(sm) += $(platform-cppflags) $(user_ta-platform-cppflags) cflags$(sm) += $(platform-cflags) $(user_ta-platform-cflags) aflags$(sm) += $(platform-aflags) $(user_ta-platform-aflags) @@ -66,6 +68,17 @@ ta-mkfiles = mk/compile.mk mk/subdir.mk mk/gcc.mk \ $(foreach f, $(ta-mkfiles), \ $(eval $(call copy-file, $(f), $(out-dir)/export-user_ta/mk))) +# Special treatment for ta/arch/$(ARCH)/$(ARCH).mk +arch-arch-mk := $(out-dir)/export-user_ta/mk/arch.mk +$(arch-arch-mk): ta/arch/$(ARCH)/$(ARCH).mk + @set -e; \ + mkdir -p $(dir $@) ; \ + echo ' INSTALL $@' ; \ + cp $< $@ + +cleanfiles += $(arch-arch-mk) +all: $(arch-arch-mk) + # Copy the .h files for TAs define copy-incdir sf := $(subst $1/, , $(shell find $1 -name "*.h")) |