Adds support for legacy compiler
gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf

To compile using this compiler instead on ARMv7 systems supply
COMPILE_LEGACY=y to make.

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

* Adds buildroot targets to common.mk
* Adds a br-ext tree containing buildroot package specification for
  optee_client, optee_examples, optee_test and optee_benchmark needed
  when building with buildroot

The buildroot target builds optee_client, optee_test, optee_examples,
optee_benchmark and busybox via buildroot. The root file system is also
created using buildroot.

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Switches to xtest-clean-common optee-examples-clean-common instead of
xtest-clean optee-examples-clean in the optee-os-clean-common. This is
needed in case the platform make file doesn't provide these targets.

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

Fix benchmark build regression, which was introduced by output path changes in
optee_benchmark last patches.

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>

QEMU v8 and FVP are both now working with upstream edk2 and
edk2-platforms. QEMU v8's dsc file is located in the edk2 folder whilst
the dsc for FVP is in the edk2-platforms folder. Due to this we had to
export the WORKSPACE variable differently otherwise we would get either
compiler errors or we would get the "Build" folder created on the top
level (something that we do not want).

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU v8, FVP)
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

We are switching from using the old semihosting based way of loading and
running OP-TEE, kernel, root fs etc on FVP to instead use a proper boot
image similar to how it is working on real devices. A difference here
compared to the past is that we are using Grub here to load the kernel.

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (FVP)
Reviewed-by: Victor Chong <victor.chong@linaro.org>

1. Add passing of MULTIARCH var to optee_benchmark main Makefile
2. Add packing of libyaml into rootfs

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>

Move MULTIARCH var definition to common.mk. It commonly used to specify
--host param in autotools configure scripts.

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>

Adds OPTEE_OS_HEADER_V2_BIN, OPTEE_OS_PAGER_V2_BIN and
OPTEE_OS_PAGEABLE_V2_BIN which are used instead of OPTEE_OS_BIN when
using upstream ARM-TF image 2 loading.

Acked-by: Victor Chong <victor.chong@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Typo s/example/file/.
Review indentation.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Igor Opaniuk <igor.opaniuk@linaro.org>

New `optee_examples` git rep is used instead of `hello_world`, which
will contain different sample applications that will show usage of
specific TEE functionality (crypto examples, random data generation,
trusted storage etc.)

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>

When LAUNCH_TERMINAL is not set, `make run` hangs with the following
messages:

 soc_term: save_current_termios: tcgetattr: Inappropriate ioctl for device
 soc_term: save_current_termios: tcgetattr: Inappropriate ioctl for device

The reason is an invalid test in common.mk.

Fixes: 07580605 ("common.mk: allow user to override launch-terminal in make run")
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

Label phony targets as such
Remove $(EDK2_PATH)/Conf/.cache in edk2-clean-common
Update description for LINUX_CLEANER_COMMON_FLAGS

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

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>

Depends on https://github.com/linaro-swg/optee_benchmark/pull/2



Signed-off-by: Yves Lefloch <YvesMarie_Lefloch@sigmadesigns.com>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>

Currently the code is hard coded to launch netcat via either xterm or
gnome-terminal. This is a little inflexible for people who spend a lot
of time in terminals. With the following you can now do:

  env QEMU_PATH=~/lsrc/qemu/qemu.git/ \
      LAUNCH_TERMINAL="tmux split-window" \
      make -j run

To bring your nc instances up in new tmux windows. The one downside is
titles aren't set as that wouldn't be maximally flexible for whatever
your launch command is.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Joakim Bech <joakim.bech@linaro.org>

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

Fixes the following error [1]:

make -C /home/travis/default/build/../optee_benchmark HOST_CROSS_COMPILE="/usr/bin/ccache /home/travis/default/build/../toolchains/aarch32/bin/arm-linux-gnueabihf-" TEEC_EXPORT=/home/travis/default/build/../optee_client/out/export TEEC_INTERNAL_INCLUDES=/home/travis/default/build/../optee_client/libteec
make: *** /home/travis/default/build/../optee_benchmark: No such file or directory.  Stop.

[1] https://travis-ci.org/OP-TEE/build/builds/237729031

 job 216.1

Fixes: 27edfc78 ("OP-TEE Benchmark")
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org. (HiKey)
[jf: update commit description]
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

Enable Benchmark feature

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>

Slightly changes the way EDK2 is compiled by sourcing edksetup.sh
instead of just running it. When compiling EDK2 that script is supposed
to be sourced.

Also records a dependency to iasl in recend EDK2 builds

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

gnome-terminal comes by default with Ubuntu and is much more advanced
than xterm, so use it when available.
While we're at it, move common definitions to common.mk.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed by: Victor Chong <victor.chong@linaro.org>

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (QEMU)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Igor Opaniuk <igor.opaniuk@linaro.org>

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>
[Rebase on top of master]
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

Default clean configuration missed the output path information
to properly cleanup build artifacts.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Igor Opaniuk <igor.opaniuk@linaro.org>

With the recently fixed UUID changes (commit in optee_os:
(9a8a19cdba48dbca89c2a35d7984e9ec28f97bda) we missed to fix the hello
world TA.

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Igor Opaniuk <igor.opaniuk@linaro.org>

"make QEMU_VIRTFS_ENABLE=y" does not enable VirtFS because of a bad
variable name in common.mk.

Test case:

(host) echo Hello >/tmp/hello
(host) make -j8 run QEMU_VIRTFS_ENABLE=y QEMU_VIRTFS_HOST_DIR=/tmp
(QEMU) mkdir /tmp/host
(QEMU) mount_shared /tmp/host
(QEMU) cat /tmp/host/hello
Hello

Fixes: 97d0529c ("Enable configuring QEMU with Virtfs support")
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Igor Opaniuk <igor.opaniuk@linaro.org>

Add support for configuring QEMU with VirtFS to share data
between the guest QEMU VM and host operating systems.

To specify dir, that has to be mounted inside QEMU VM, edit
QEMU_VIRTFS_HOST_DIR var in qemu.mk

To mount shared folder within QEMU ARM VM, run:
$ mount -t 9p -o trans=virtio host /tmp/shared/

If Virtfs support is enabled, libattr1-dev and libcap-dev
have to be installed before configuring QEMU.

For additional details see:
http://wiki.qemu.org/Documentation/9psetup



Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Igor Opaniuk <igor.opaniuk@linaro.org> (qemu_v7/v8)

All targets already enable core debug log level: 3.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)
Tested-by: Joakim Bech <joakim.bech@linaro.org> (RPi3, MTK8173)
Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (qemu_v7/v8)

Factorize embedded file list and rootfs generation for fvp, juno,
mediatek, qemu, qemu_v8 and rpi3.

busybox is madatory to all 'common' rootfs.
optee-client, xtestn helloworld are always embedded: moved to common.

Remove obsolete CFG_DEV_PATH.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)
Tested-by: Joakim Bech <joakim.bech@linaro.org> (RPi3, MTK8173)
Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (qemu_v7/v8)

Besides the rpi3.mk file itself, this also contains the additional
kconfig files and flags used when building Linux and U-Boot.

A set of firmware images are also included.

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: David Brown <david.brown@linaro.org>

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: David Brown <david.brown@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org> (qemu)
Tested-by: Joakim Bech <joakim.bech@linaro.org> (RPi3 with mods
to build_ta_helloworld_qemu.sh for a 64-bit build)

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

Build support for generic driver on FVP.

Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>

OPTEE_LINUXDRIVER_CLEAN_COMMON_FLAGS needs to specify the module M
flag, else linux is cleaned instead of optee_linuxdriver.

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>

This patch introduce compilation mode 32bits / 64 bits independently
for every parts:
- COMPILE_NS_USER:   Non-Secure User
- COMPILE_NS_KERNEL: Non-Secure Kernel
- COMPILE_S_USER:    Secure User
- COMPILE_S_KERNEL:  Secure Kernel

This is used on FVP, the non-secure part being bits, but the secure
part can be specified as 32 or 64 bits (64bits by default).

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Pascal Brand <pascal.brand@linaro.org> (QEMU)
Tested-by: Pascal Brand <pascal.brand@linaro.org> (FVP)
Signed-off-by: Pascal Brand <pascal.brand@st.com>

common: Add CROSS_COMPILE_ta_arm## flags
hikey and mediatek: Update with new TA dev kit name

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

Fixes https://github.com/OP-TEE/build/issues/28

.

In common.mk *_CLEAN_COMMON_FLAGS ?= *_COMMON_FLAGS but in the
platform makefiles (e.g. hikey.mk) they're defined as
such:
*_COMMON_FLAGS += x y z
*_CLEAN_COMMON_FLAGS += x

When expanded during a build, *_CLEAN_COMMON_FLAGS becomes
"x y z x". Variables can be repeated, which may be nothing more
than a cosmetic issue, but if any of those variables are make
targets, then 'make clean' will build them before cleaning.

To fix this, we remove the dependency of *_CLEAN_COMMON_FLAGS on
*_COMMON_FLAGS.

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org> (hikey)

- Kernel config fragments that were used by the QEMU makefile are
merged into kconfigs/qemu.conf. Now, each platform has its own file
in kconfigs/
- All platforms: CONFIG_DMA_SHARED_BUFFER cannot be enabled directly
because it is  a not a visible symbol (has no prompt in Kconfig).
CONFIG_DRM is set instead which depends on DMA.
- kconfigs/hikey.conf: keep only what is necessary

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (FVP, HiKey)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU, MTK8173)