Build support for generic driver on HiKey.

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

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

This config is required to prevent errors on boot like below when using
https://github.com/96boards-hikey/linux

 hikey-mainline-rebase branch:

ssp-pl022 f7106000.spi: could not find pctldev for node /soc/pinmux@f7010000/spi0_pmx_func, deferring probe
gpiochip_add: GPIOs 480..487 (f8014000.gpio) failed to register

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: Jerome Forissier <jerome.forissier@linaro.org>

Fixes 'make check' error introduced by commit 6f0c0eb9 ("qemu: Add
'-machine secure=on' to arguments").

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

This is required to move OP-TEE to upstream QEMU.

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

To make it a bit easier to understand how to do a recovery and how to
flash HiKey, we have added a new make target for recovery which tells
how to configure the jumpers and the initiates the recovery itself. In
addition to this we have changed the "flash" make target so that it
does the same as stated in the instructions on the 96boards "Getting
started" page.

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

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

* Updates build arguments for ARM-TF
* Update path to latest Foundation model

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

Signed-off-by: James Kung <james.kung@linaro.org>
Tested-by: James Kung <james.kung@linaro.org> (MT8173 EVB)
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

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

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>

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org> (hikey)
Reviewed-by: Joakim Bech <joakim.bech@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)

Update with new TA dev kit name for FVP and QEMU.

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

- 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)

We have observed random failures of "make check" when run in the
Travis environment (OP-TEE regression testing). Every time it fails,
the log file has the following errors [1]:

  Starting QEMU...send: spawn id exp7 not open
      while executing
  "send -- "\r""
      (file "qemu-check.exp" line 54)
  == /home/travis/optee_repo/build/serial0.log:
  spawn ../qemu/arm-softmmu/qemu-system-arm -nographic [...]
  Using QEMU provided DTB at 0x40000000
  [...]
  squashfs: version 4.0 (2009/01/31) Phillip Lougher
  jffs2: version 2.2. (NAND) send: spawn id exp7 not open
      while executing
  "send -- "\r""
      (file "qemu-check.exp" line 54)
  == end of /home/travis/optee_repo/build/serial0.log

It seems that QEMU exits unexpectedly as the kernel is initializing
the JFFS2 filesystem driver. Since this is something we don't need, I
thought I'd just disable this driver and see if it makes things more
stable.
Well, indeed I could not reproduce the issue with this patch applied.

[1] https://travis-ci.org/OP-TEE/optee_os/builds/90051975#L4577



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>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

This will hopefully fix occasional errors observed during OP-TEE Travis
regression testing (make check):
  rcu_sched detected stalls on CPUs/tasks...

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU)

GCC 5 and above fails to build OP-TEE project under QEMU.
Warnings are now treated as errors by default.

On line 60 --extra-cflags="-Wno-error" fixes the issue.
Please reference
[OP-TEE/optee_os#550](https://github.com/OP-TEE/optee_os/issues/550

) for
specifics.

My machine is running gcc version 5.2.1 20151010 and I can confirm this
now works with change. It affects both default.xml and default_stable.xml repo
configurations for OP-TEE.

Reviewed-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jorden Whitefield <j.whitefield@surrey.ac.uk>

Sometimes it happens that the umount fails saying that a device/resource
is busy when trying umount the device after the filesystem has been
created. We don't know how and why this happens, but in the meantime
while waiting for a proper solution we have added a sleep that seems to
solve the problem.

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

Fix bug reported in https://github.com/OP-TEE/optee_os/issues/542



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

It can sometimes be useful to pass extra arguments to the QEMU that is
launched via the 'run-only' target. Support this via an environment
variable QEMU_EXTRA_ARGS, which can be used like:
 make run-only QEMU_PATH=path/to/qemu/directory QEMU_EXTRA_ARGS='args here'

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

At the moment we start several terminals, and then sleep for a second
before running a QEMU instance which will connect to processes run
in those terminals. This will fail if the terminals are displayed on
a slow remote X11 connection, because the terminals won't have
completed startup before the one second delay elapses.

Replace the delay with a loop that checks whether there's anything
listening on the relevant TCP ports yet.

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



Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Cedric Chaumont <cedric.chaumont@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org>

- Make sure launch-terminal cannot block by adding a '&'
- Use xterm instead of gnome-terminal because it is more likely to be
installed by default.

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

.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Pascal Brand <pascal.brand@linaro.org>
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>

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

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

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

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

Signed-off-by: SY Chiu <sy.chiu@linaro.org>
Tested-by: SY Chiu <sy.chiu@linaro.org> (QEMU)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>

Adds two new targets, one that downloads the necessary nvme.img file and
another target that flash the device. We have also added a couple of
.PHONY directives to a few targets.

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

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)
Tested-by: SY Chiu <sy.chiu@linaro.org> (MT8173 EVB)
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>

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

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

The Expect timeout can be passed via make as, for instance:
  make check TIMEOUT=60

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

* Detect kernel rcu_sched stall + cosmetic improvements
* Start QEMU with options '-nographic -monitor none'. Without this,
QEMU cannot be run on the Travis servers which have no display.
'-monitor none' is needed when '-nographic' is set and one wants to
redirect serial port 0 (first occurrence of '-serial stdio'), otherwise
a conflict occurs and the following message is shown:
    qemu-system-arm: -serial stdio: cannot use stdio by multiple character
    devices
* Fix undefined variable error on timeout
* Set LD_LIBRARY_PATH. The libraries that come with the compiler
sometimes end up under /lib, or under /lib/arm-linx-gnueabihf. By setting
LD_LIBRARY_PATH we support both.
* Catch kernel panic/timeout on boot to make the script more robust.

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

- If $(CROSS_COMPILE) is defined, use it to set the other cross compile
variables used in common.mk: CROSS_COMPILE_{S,NS}_{USER,KERNEL}.
The linux and qemu targets are also adjusted to use those variables,
they may be updated later when common targets are added.
- Use $(MAKE) instead of plain 'make' so that some special make flags
are handled properly (-n for instance).
- Fix filelist-tee dependencies. Since this target uses 'find' to make
a list of files built by xtest, xtest is a dependency.
- make check: add DUMP_LOGS_ON_ERROR variable. To dump serial0.log and
serial1.log when test fails, run:
    make check DUMP_LOGS_ON_ERROR=1
- Add missing + before $(MAKE). The $(bios-qemu-common) macro defines
a command that must start with a '+' character for reasons related to
the GNU make jobserver implementation [1]. Without it, the sub-make
would print the following warning and not run in parallel:
    make[1]: warning: jobserver unavailable: using -j1.  Add `+' to
    parent make rule.
  [1] http://make.mad-scientist.net/papers/jobserver-implementation/


  ("The Final Result", point 7.)
- Remove redundant dependencies

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