The kernel image for QEMUv8 is Image, not zImage (there is no
compressed image support in Linux for arm64). Fix the makefile.

Fixes: c54f4f51 ("qemu, qemu_v8: do not build Linux modules")
Signed-off-by: Jerome Forissier <jerome@forissier.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

The QEMU and QEMUv8 builds do not need any kernel module to boot and
run xtest etc. so we can save build time by only building the kernel
image by default.

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

Introduce EDK2_TOOLCHAIN and EDK2_ARCH and fvp, qemu_v8 and synquacer
builds to better control some build variables.

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

Make TF-A and EDK2 builds for fvp and qemu_v8 configurable using the
DEBUG flag instead of hardcoding.

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

Allow control of DEBUG flag from a single common location (common.mk)
rather than all over platform specific makefiles.

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

Updates qemu_v8.mk and qemu-check.exp so that "make check" and "make
check-only" are supported for QEMUv8, as they are for QEMU.

Signed-off-by: Jerome Forissier <jerome@forissier.org>

This commit adds support for Ultra96 board.
It relies on ultra96 flavor added to OP-TEE ZynqMP platform.
zynqmp makefile is modified in the following way:
- Default BSP rootfs is replaced by a minimal rootfs which supports
zcu10x and Ultra96 boards.
- New petalinux-package target available to generate BOOT.BIN file.

Signed-off-by: Michael Grand <michael.grand@gmail.com>
Acked-by: Joakim Bech <joakim.bech@linaro.org>

Depending on the size of the string in the variable
TARGET_CONFIGURE_OPTS and number of examples, the size of the
string in OPTEE_EXAMPLES_BUILD_TAS produced by evaluation of
the $(foreach...) statement may exceed the maximum length for
execvp() calls from make (128KiB). Delaying the enumeration of
targets by passing a loop-statement for the shell expands the
variables only once and keep the length of the string independent
of the number of examples.

Signed-off-by: Markus S. Wamser <markus.wamser@mixed-mode.de>
Acked-by: Jerome Forissier <jerome@forissier.org>

Depending on the size of the string in the variable
TARGET_CONFIGURE_OPTS and number of tests, the size of the
string in OPTEE_TEST_BUILD_TAS produced by evaluation of
the $(foreach...) statement may exceed the maximum length for
execvp() calls from make (128KiB). Delaying the enumeration of
targets by passing a loop-statement for the shell expands the
variables only once and keep the length of the string independent
of the number of tests.

Signed-off-by: Markus S. Wamser <markus.wamser@mixed-mode.de>
Acked-by: Jerome Forissier <jerome@forissier.org>

Provide TF-A path for l-loader

Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
Reviewed-by: Jerome Forissier <jerome@forissier.org>

In commit (7fbd6ce2) "common.mk: buildroot: append BR2_ variables to
config automatically", flags were refactored and the old
BUILDROOT_GETTY_PORT got replaced with BR2_TARGET_GENERIC_GETTY_PORT.

TI platforms (am43xx, am57xx and dra7xx) were'nt updated hence the wrong
ttyAMA0 were used instead of ttyS0 (am43xx and dra7xx) and ttyS2
(am57xx). By setting BR2_TARGET_GENERIC_GETTY_PORT properly, this issue
gets resolved.

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome@forissier.org>
Acked-by: Andrew F. Davis <afd@ti.com>

In commit (7fbd6ce2) "common.mk: buildroot: append BR2_ variables to
config automatically", flags were refactored and the old
BUILDROOT_GETTY_PORT got replaced with BR2_TARGET_GENERIC_GETTY_PORT.
Because of that Rpi3 didn't spawn a console when booting up. By setting
BR2_TARGET_GENERIC_GETTY_PORT to ttyS0 things will work again.

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

STRACE_PATH is a leftover from before buildroot and is not used anymore
so remove it.

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

Adds the required flags and configuration files to enable Wi-Fi on the
HiKey960 board. The network name and password have to be set in
br-ext/board/hikey960/overlay/etc/wpa_supplicant.conf before building.
Then Wi-Fi can be enabled on the board by running 'ifup wlan0' as root.

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

Currently, when ccache is available, it is used to build OP-TEE
but due to some wrong settings the user space libraries use the
compiler directly without ccache. Fix that.

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

To set additional BR2_ variables, the user currently needs to edit
common.mk and modify the buildroot recipe. It is inconvenient,
especially since a line with a cumbersome syntax has to be added. One
would expect to be able to specify the desired value on the make
command line or directly in the Makefile. For instance, to enable
debug mode: make BR2_ENABLE_DEBUG=y.

This patch updates the buildroot recipe to enumerate all the Makefile
variables that start with BR2_, and each such variable is automatically
added to ../out-br/extra.conf.

As a result the existing BR2_ variables can be set in a simpler way.

Tested on QEMU, results in the same ../out-br/.config except for the
line order.

Signed-off-by: Jerome Forissier <jerome@forissier.org>
Suggested-by: Heino Madsen <heino.madsen@huawei.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

Transition to the new trusted firmware repo location at
http://git.trustedfirmware.org

.

NOTE: The 'arm-trusted-firmware' instances under zynqmp* have not
been changed.

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

To reflect the new trusted firmware repo at
http://git.trustedfirmware.org

.

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

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

Fix typo for setting CFG_TEE_BENCHMARK in OPTEE_CLIENT_CONF_OPTS.

Fixes: 93758cc1 ("buildroot: provide CFG_TEE_BENCHMARK in optee_client")
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>

Copy both RPi3 B and RPi3 B Plus dtb files to enable
booting both the targets. This will avoid adding a seperate
rpi3-bplus makefile.

Signed-off-by: Philby John <philby.j@hcl.com>
Signed-off-by: Vv Ramya <ramyavv@hcl.com>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> # (rpi3b)

This makes it a bit more convenient for 4G board users who are flashing
manually in that they don't have to change the makefile to get the
required ptable image.

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

This is useful for debugging or testing eMMC and RPMB issues.

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

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

This commit add supports to build flash binaries for DeveloperBox.
It builds an OPTEE binary, a FIP package containing the OPTEE,
a flash image containing the FIP package and EDK2, and its
corresponding update capsule.

Signed-off-by: Pipat Methavanitpong <pipat.methavanitpong@linaro.org>
Acked-by: Sumit Garg <sumit.garg@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

The BR2_KERNEL_HEADERS_4_10 has been depracted, so when trying to build
with GDBSERVER=y we got this warning:

  Makefile.legacy:9: *** "You have legacy configuration in your .config!
  Please check your configuration.".  Stop.

To better match recent toolchain updates in this git (gcc updates and
kernel header updates, commit e0298161), we also update buildroot to
use and provide a GCC8.x based toolchain as well as 4.19 kernel headers.

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU v7)
Acked-by: Jerome Forissier <jerome@forissier.org>

In the GCC v8.2-2018.08 toolchain (previous default in OP-TEE) the
GDB/TUI mode was disabled, which made debugging using GDB slightly more
complicated. However, in more recent versions of GCC like the one
introduced here, i.e., GCC8.3-2019.03, Arm have re-enabled the TUI mode.

But to be able to upgrade the toolchain, one must also step up kernel
headers so that the toolchain matches the kernel headers used by
Buildroot. This means that we are stepping up from 4.18 kernel headers
to 4.19 kernel headers, which seems to be compatible with the version of
GCC that is being introduced in this patch.

Note that after this commit, older GCC versions will not work any
longer when building full OP-TEE developer setups using OP-TEE's
manifest.git and build.git, i.e., trying to run GCC8.2 for example will
give a kernel header mismatch error.

Fixes #334.

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

Now that our HiKey960 build uses our common Linux branch [1], we no
longer need to force CFG_SECURE_DATA_PATH=n in the main Makefile (the
platform branch we were using previously was lacking the ION unmapped
heap code, which is why SDP had to be disabled).

Let OP-TEE build with the default value for CFG_SECURE_DATA_PATH, which
is 'y' for HiKey960, and configure the Linux kernel accordingly.

[1] https://github.com/linaro-swg/linux

 branch optee. This branch has
been used for the HiKey960 build since OP-TEE 3.4.0, the branch was
based on upstream kernel v4.19.

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

ION_DUMMY is an old, deprecated configuration flag in the ION driver
that is now useless. Therefore, remove the useless CONFIG_ION_DUMMY=y.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Suggested-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

Similar fix to commit 106b53a2 ("buildroot: always declare
BR2_PACKAGE_OPTEE_BENCHMARK_SITE").

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

On recent versions of gnome-terminal you will get this warning:

"Option "-t" is deprecated and might be removed in a later version of
gnome-terminal."

There seems to be no substitution for it, therefore let's just get rid
of it.

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

With CFG_TA_TEST_PATH now defaulting to n in optee_client for better
security, this needs to be set explicitly to pass xtest 1008.

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

Fixes a mistake in the optee_os install step which prevents the
libraries from being copied into the root FS staging area.

Fixes: 91ebff72 ("buildroot: add optee_os package to copy shared libraries into the root FS")
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

Provide an additional option for CFG_NW_CONSOLE_UART and CFG_SW_CONSOLE_UART
to use the secondary console on the 40-pin Low Speed Connector, namely UART2.

Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>

Signed-off-by: Hashem Tatari <hashem.tatari@exset.com>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>

When the DEBUG config was set, the optee_os was still built with
DEBUG=0 because the flag was hardcoded. As a result the optimization
was still O2. This is fixed by using the global DEBUG flag instead of
the hardcoded value of zero.

Signed-off-by: Hashem Tatari <hashem.tatari@exset.com>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>

This commit adds support for Xilinx ZynqMP boards to the OPTEE/build repository.
The provided makefile relies on Xilinx Petalinux 2018.2 itself based on Yocto.
The makefile helps to create, patch and build a customized Petalinux project
with OPTEE support. Boards can be emulated using Petalinux's QEMU.

Signed-off-by: Michael Grand <michael.grand.mg@gmail.com>
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Tested-by: Michael Grand <michael.grand.mg@gmail.com>

When OP-TEE is built with CFG_ULIBS_SHARED=y, TA shared libraries are
created. They have to be installed into the target root FS in order
to be found at runtime.

This patch adds a custom package to do just that.

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

With Linux kernel v5.0, CONFIG_SCSI_UFS_HISI is built as a module by
default. We want this driver to be statically linked, or the board
won't boot.

Note: HiKey620 does *not* need a similar fix.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (HiKey 620)

We currently do not copy any kernel module into our root FS, they are
not needed. Therefore, drop the "modules" target when building the
kernel to save compile time.

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