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

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

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

Now that Arm Trusted Firmware is used as the secure boot loader
and bios_qemu_tz_arm is used as the non-secure bootloader, all binaries
are expected to be found in the $(BINARIES) directory. Symbolic links
are created by various targets in the qemu.mk.
The 'check' target should create a link to rootfs.cpio.gz, similar to
the 'run' target.

Fixes: 46ddff2b ("qemu: boot from arm-tf")
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Joakim Bech <joakim.bech@linaro.org>

Fixes: 46ddff2b ("qemu: boot from arm-tf")

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

Fixes: 46ddff2b ("qemu: boot from arm-tf")

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

Checking Qemu arguments expects the tool 'expect'. This change update
to build documentation accordingly.

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

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

bios_qemu_tz_arm build does not dependent on optee, rootfs or kernel.
Alpha order on all/clean main dependencies and paths definitions.

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

Arm-tf is used as secure bootloader and bios_qemu_tz_arm as non-secure
bootloader.

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

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

Commit f9f39124 ("hikey*: support migration to BL2_EL3 on arm-tf")
has updated the flash target to use hisi-nvme.img instead of nvme.img,
thus adopting the new naming introduced by upstream commit b5ae2c13438e
("installer: add hisi- prefix to ptable, sec_xloader, fastboot,
sec_uce_boot, and sec_usb_xloader imgs").
Unfortunately, the line dealing with sec_xloader.img was not updated.
Do it to fix "make flash".

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

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

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

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

BL0 has been renamed to SCP_BL1.
Bl30 has been renamed to SCP_Bl2.

Update makefile accordingly

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

MTK8173 in manifest.git has just recently been deprecated and therefore
we need to remove it from Travis.

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

Abort dumps are now documented in details in optee_os, so just insert a
link here.

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

The format and the name of the OP-TEE maintainers file has changed.
Update references accordingly.

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

Since commit eed314d1 ("qemu: build using buildroot"), the login
and the shell prompts of the root FS have changed. Adjust our "make
check" accordingly.

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

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>

Signed-off-by: Victor Chong <victor.chong@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: Jerome Forissier <jerome.forissier@linaro.org> (HiKey960)
Tested-by: Victor Chong <victor.chong@linaro.org> (hikey960)
Tested-by: OP-TEE HiKey auto builder (hikey)

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>

Adds external packages repository for buildroot containing:
* Packing for optee_client, optee_examples, optee_test and optee_benchmark
* Configs and a script to assembly defconfigs needed for 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>

The 'strace-clean' target runs the 'clean' target in the strace project
directly, and afterwards removes the Makefile and configure scripts as well.
This is the same strategy used by other platforms using strace (hikey.mk and
hikey960.mk), however other platforms check for the existence of the Makefile
before executing $(MAKE), allowing a build to be cleaned multiple times.
Without this check, subsequent invocations of 'strace-clean' (or simply
'clean') fail as there is no Makefile to use.

Fixes:

$ make strace-clean
[...]
$ make strace-clean
[...]
make[1]: Entering directory '/home/goatshriek/optee-armv8/strace'
make[1]: *** No rule to make target 'clean'.  Stop.

Signed-off-by: Joel Anderson <jeander@vt.edu>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

Like other platforms (fvp.mk, hikey.mk, hikey960.mk, hikey_debian.mk)
define the edk2-call macro to invoke the EDK2 build script rather than
$(MAKE) directly. Indeed, the edk2-clean-common target in common.mk
expects $(edk2-call) to take the 'cleanall' argument, which the EDK2
build script does accept, but the EDK2 makefile doesn't (there is no
cleanall rule in EDK2).

Fixes:

 $ make clean
 [...]
 make[1]: Entering directory '/home/jerome/optee_repo_qemu_v8/edk2'
 make[1]: *** No rule to make target 'cleanall'.  Stop.

Another option to fix the above error would be to change the edk2-clean
target to no use edk2-clean-common and call "$(MAKE) clean" directly.
But then, it would be inconsistent with other platforms and the EDK2
build script may be a better interface than raw make (more stable).

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reported-by: Joel Anderson <jeander@vt.edu>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

With the recent QEMU v7 changes in manifest.git:
  918f04199c ("qemu: general cleanup and remote changes")
where the remote "github" was introduced, we introduced a regression for
the QEMU v7 Travis builds. The remote name "github" has been used in
Travis when setting up a remote for the build.git itself. By renaming
the remote we do not get any naming collisions and the Travis build
script will be prepared for similar changes in manifest.git for the
other platforms.

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

Multiple personality support in strace is not something that we make use
of in OP-TEE for the moment, so instead of putting more prerequisites on
our builds let us just disable this feature in strace.

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

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

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

Signed-off-by: Jerome Forissier <jerome.forissier@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>

As a first step to update EDK2 to running latest  we are introducing
grub which will be a needed component when booting UEFI without
semihosting.

This particular patch will just bulid grub, it will still not be used
when running FVP (that is enabled in later patches in this series).

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

Signed-off-by: Alex Demyankov <alex.demyankov@gmail.com>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

It's assumed we have a Juno R0 board. It isn't always the case. If someone
has another revision, he'll prefer to use the right device tree for his
board.

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

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