Update the toolchain built with the buildroot sdk target used on
non-x86_64 hosts to GCC version 10.2.

Tested-by: Jerome Forissier <jerome@forissier.org> (QEMUv8 64/32, host uname -m: aarch64)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

The needed precompiled toolchains provided by Arm are only available for
x86_64 hosts. For all other host architectures we build it with
Buildroot itself.

Reviewed-by: Jerome Forissier <jerome@forissier.org>
Tested-by: Jerome Forissier <jerome@forissier.org> (QEMUv8 64/64, host uname -m: aarch64)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Update the default GCC version to v10.2.

Fixes: https://github.com/OP-TEE/optee_os/issues/4233



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.org>

ION has been deprecated in the upstream Linux kernel since v5.11 [1].
Consequently, it was removed from the linaro-swg/linux branch optee
shortly after the release 3.13.0 of OP-TEE. Remove the corresponding
kernel configuration flags which are now unused.

Link: [1] https://github.com/torvalds/linux/commit/e722a295cf493388dae474745d30e91e1a2ec549


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

Commit f1ca9916 ("qemu: disable kernel CONFIG_JFFS2_FS") was a
workaround to an issue that does not seem to be reproducible anymore.
That was more than five years ago, and the root cause was never clearly
identified. Many things have changed since.
I did not meet any problem running "make check" with CONFIG_JFFS2_FS=y
on my local development machine (it is enabled by default in the Linux
kernel's arch/arm/configs/qemu_defconfig). Therefore it seems safe to
remove this CONFIG_JFFS2_FS=n.

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

Explicitly set CFG_TEE_BENCHMARK to either ON or OFF upon br-ext
config switch BR2_PACKAGE_OPTEE_BENCHMARK_EXT and not rely on
the default configuration in component CMake files.

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

New BR2_PACKAGE_OPTEE_CLIENT_EXT_RPMB_EMU boolean configuration switch
in optee_client_ext package to set RPMB_EMU to ON or OFF in CMake build
of optee_client repository.

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

head.S is not used since commit 2e947f2e ("rpi3: use upstream ATF
and U-boot"). Remove it, as well as RPI3_HEAD_BIN which was the path to
the binary file after compilation.

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

The image generation for the board NXP® i.MX 8MQuad Evaluation Kit (EVK)
has been refactored, so the rootfs can either be loaded from a RAMDisk
or from a partition on a media storage such as an SD card, by enabling
the compilation flag USE_PERSISTENT_ROOTFS.
In addition, the image size is now dynamically allocated, depending on
the size of the partition(s) that is/are part of the image.

The flash-image target (part of the all target) produces a out/boot.img
which can be copied to a SD card using the command:
dd if=out/boot.img of=/dev/sdX bs=1M conv=fsync

Where 'X' has to be adjusted to the device of the SD card when connected
to the host system.

     ****** Please be careful to choose the correct device ******
     ****** or there's a risk of damaging the host system. ******

Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Jämes Ménétrey <james.menetrey@unine.ch>

This allows for example kaslr to be disabled when debugging
the kernel using GDB.

e.g. make QEMU_KERNEL_BOOTARGS=nokaslr run-only

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Reviewed-by: Jerome Forissier <jerome@forissier.org>

qemu-system-aarch64: -semihosting-config enable,target=native:
 warning: short-form boolean option 'enable' deprecated

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Reviewed-by: Jerome Forissier <jerome@forissier.org>

Enables the kernel gdb python helper scripts to be built
that allows easier introspection of kernel data structures.
e.g. lx-dmesg extracts dmesg.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>

This allows CONFIG_GDB_SCRIPTS=y to be used with optee-build
and means we can more easily debug the kernel using gdb.

CONFIG_GDB_SCRIPTS gives you python commands such as lx-dmesg
(useful for hangs before any serial console output) and lx-symbols
(useful for loading kernel module symbol information).

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>

To avoid initramfs becoming huge with modules they
can be mounted from host into the guest filesystem.

(host)
make linux-modules
make QEMU_VIRTFS_ENABLE=y QEMU_USERNET_ENABLE=y run-only

(qemu guest)
mount -t 9p -o trans=virtio host /host
ln -s /host/out/kernel_modules/lib/modules/ /lib/modules
modprobe virtio-video

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Reviewed-by: Jerome Forissier <jerome@forissier.org>

Fix path of the DTB file for ED1 that wrongly pointed to the EV1 DTB
file path.

Fixes: 4dc6908c ("stm32mp1: define STM32MP15C-ED1")
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>

STM32MP15C-ED1 is the child board plugged on EV1 mother board. ED1 can
be used without its mother board with some interface restrictions
(I.e. no USB-C). This change defines the platform flavor. The several
components (optee_os, tf-a, u-boot, linux) already support ED1 DTS file
identifier.

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

Enable SCMI support in the Linux kernel configuration of the
stm32mp1 platform.

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

Change post-image.sh script for stm32Mp1 platform to not try to
copy invalid files are symbolic links to DTB files previously built
in the same build environment. This change makes the script more
flexible.

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

Change post-image.sh script for stm32mp1 platform to
dereference the copied files.

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

Clang 12.0.0 was released on April 15 2021 (with amd64 binaries uploaded
on April 22). It notably fixes the following llvm-objdump warnings [1]:

 $ make COMPILER=clang optee-os 2>&1 | grep -B 1 objdump
   OBJDUMP out/arm/core/tee.dmp
 llvm-objdump: warning: 'out/arm/core/tee.elf': failed to parse debug information for out/arm/core/tee.elf
 --
   OBJDUMP out/arm/ldelf/ldelf.dmp
 llvm-objdump: warning: 'out/arm/ldelf/ldelf.elf': failed to parse debug information for out/arm/ldelf/ldelf.elf
 --
   OBJDUMP out/arm/ta/avb/023f8f1a-292a-432b-8fc4-de8471358067.dmp
 llvm-objdump: warning: 'out/arm/ta/avb/023f8f1a-292a-432b-8fc4-de8471358067.elf': failed to parse debug information for out/arm/ta/avb/023f8f1a-292a-432b-8fc4-de8471358067.elf
 --
   OBJDUMP out/arm/ta/pkcs11/fd02c9da-306c-48c7-a49c-bbd827ae86ee.dmp
 llvm-objdump: warning: 'out/arm/ta/pkcs11/fd02c9da-306c-48c7-a49c-bbd827ae86ee.elf': failed to parse debug information for out/arm/ta/pkcs11/fd02c9da-306c-48c7-a49c-bbd827ae86ee.elf

Link: [1] https://github.com/OP-TEE/optee_os/issues/3808


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

To make upgrades easier, refactor the get_clang.sh script slightly.

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

The string matching in qemu-check.exp is a bit too strict when it comes
to matching the xtest output to print progress marks. Only tests in the
'regression' suite are recognized. Now xtest supports 'gp' and 'pkcs11'
tests so a couple of regular expressions need to be updated.

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

The default timeout is insufficient to run the full xtest suite
(regression+gp+pkcs11) with pager enabled (CFG_WITH_PAGER=y) on QEMU.
Increase it to 15 minutes.

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

Remove deprecated dependencies on target optee-os-clean-common:
benchmark-app-clean-common, xtest-clean-common and
optee-examples-clean-common where removed by commit [1].

Fixes build failure with trace like:
  bash> make clean -j$(nproc)
  (...)
  make: *** No rule to make target 'xtest-clean-common', needed by 'optee-os-clean-common'.  Stop.

Link: [1] 819066fb ("common.mk: remove unused targets and definitions")
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jerome Forissier <jerome@forissier.org>

Older EDK2 toolchains (GCC49) will cause errors when updating EDK2, therefore,
we use GCC5 instead.

Signed-off-by: Mingyuan Xiang <xiang_my@outlook.com>
Reviewed-by: Jerome Forissier <jerome@forissier.org>
Tested-by: Jerome Forissier <jerome@forissier.org> (QEMUv8)

QEMU has adopted meson as the build system. As a result, the output of QEMU will
be located in the $(ROOT)/qemu/build, so we should reflect this change.

Signed-off-by: Mingyuan Xiang <xiang_my@outlook.com>
Reviewed-by: Jerome Forissier <jerome@forissier.org>

'make edk2-clean' fails with the following error:

 build.py...
  : error 000E: One Path in PACKAGES_PATH doesn't exist
         /home/jerome/work/optee_repo_qemu_v8/edk2/../edk2-platforms

The reason is $(ROOT)/edk2-platforms does not exist on this platform.
Fix this by using the proper platform-specific variable
$(EDK2_PLATFORMS_PATH) in the edk2-clean-common target like is done in
edk2-common.

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

OPTEE_CLIENT_EXPORT is unused, remove it.

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

OPTEE_CLIENT_EXPORT is unused, remove it.

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

The OP-TEE client, examples, tests (xtest) and benchmark projects are
built using Buildroot. Therefore all the related targets and
definitions in common.mk are unused. Remove them. Similarly, gen_rootfs
can be removed since the root FS is created by Buildroot.

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

The OP-TEE client is built using Buildroot so the optee-client and
optee-client-clean targets in ti/ti-common.mk are unused. Remove them.

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

The qemu target currently runs the configure script unconditionally
which takes some time and causes unnecessary recompilations.

Split the configuration and the build steps and make the configuration
depend on $(QEMU_PATH)/config-host.mak to avoid the above issue.

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

Genimage script configuration had wrong image name on bootfs partition.
Changed the parameter "image" to correct name for the image to be
generated successfully and to allow successful boot on STM32MP157C-EV1
board.

Signed-off-by: Timothée Cercueil <litchi.pi@protonmail.com>
Signed-off-by: Timothée Cercueil <timothee.cercueil@st.com>
Acked-by: Jerome Forissier <jerome@forissier.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>

With 6edcf9dc2e1a ("efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER
should not default to yes") (included in Linux v5.11) we need to set
EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y explicitly in order to enable
initrd support.

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

Adds support for the NXP® i.MX 8MQuad Evaluation Kit (EVK) using the
same standard buildroot setup as for the other platforms here.

The flash-image target (part of the all target) produces a out/boot.img
which can be copied to a SD card using the command:
dd if=out/boot.img of=/dev/sdX bs=1M conv=fsync

Where 'X' has to be adjusted to the device of the SD card when connected
to the host system.

     ****** Please be careful to choose the correct device ******
     ****** or there's a risk of damaging the host system. ******

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

Added the additional packages needed for network and ssh support
to be included in the root file system for rpi3 platform.

Link: https://github.com/OP-TEE/optee_client/issues/234


Signed-off-by: Jayanth Dodderi Chidanand <jayanthchidanand94@gmail.com>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

Add the --disable-docs option to QEMU_CONFIGURE_PARAMS_COMMON so that no
documentation is generated during the QEMU build. Documentation is not
needed and it may fail to build in some environments. For instance on
Ubuntu 18.04.5 LTS:

 Warning, treated as error:
 docs/qemu-option-trace.rst.inc:4:Malformed option description '[enable=]PATTERN', should look like "opt", "-opt args", "--opt args", "/opt args" or "+opt args"
 make[1]: *** [.docs_built_system_qemu.1_docs_built_system_qemu-block-drivers.7_docs_built_system_qemu-cpu-models.7.sentinel.] Error 2

The error is caused by sphinx-build:

 $ sphinx-build --version
 sphinx-build 3.2.1

The version that comes with Ubuntu 20.04.1 LTS works fine:

 $ sphinx-build --version
 sphinx-build 1.8.5

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

Install all TAs found in devkit into target filesystem. This change
allows OP-TEE test environment to exercise in-tree TAs as the pkcs11 TA.

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

In build.git we haven't been using Travis for almost 3 years and even if
we would enable it again, it would probably not work since it's
configured to run a very old Ubuntu release. We also stopped using this
as a full regression build testing since a) our build time had increased
and b) Travis had become more popular that prolonged the build time c)
we often hit the run-time limit for free accounts.

Because of this and to avoid confusion we should remove the Travis
configuration.

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

Set PYTHON3_ENABLE=TRUE so that EDK2 is built with Python 3. Python 2 is
deprecated. Requires EDK2 tag edk2-stable201905 or later (older versions
simply ignore PYTHON3_ENABLE).

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