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>

while use cmd " make -f toolchain.mk -j2" for download gcc on ubuntu machine,
error occur
"/bin/sh: 1: Bad substitution make:*** [toolchain.mk:39:aarch64] Error 2"
root reason is that sh of ubuntu point to dash, not bash.
the code caused the error was
"(cd $(1)/bin && for f in *-none-linux*; do ln -s $$f $${f//-none} ; done;) \"

Signed-off-by: Yunli Liu <994605959@qq.com>
Acked-by: Jerome Forissier <jerome@forissier.org>

Embed opensc package for pkcs11-tool to play with the PKCS11 TA.

Examples of using pkcs11-tool with PKCS11 TA:

  # Get tokens/slots info
  pkcs11-tool --show-info
  pkcs11-tool --list-token-slots
  pkcs11-tool --list-mechanisms

  # Initialize token and user PIN
  pkcs11-tool --init-token --label test-token --so-pin 1234567890
  pkcs11-tool --label test-token --login --so-pin 1234567890 \
              --init-pin --pin ABCDEFGHIJ

  # Generate a 2048bit RSA key
  pkcs11-tool --token-label test-token --pin ABCDEFGHIJ \
              --keypairgen --key-type RSA:2048 --id 123 --label rsa-test-key

  # List token object
  pkcs11-tool --token-label test-token --list-objects

Co-developed-by: Gábor Székely <szvgabor@gmail.com>
Signed-off-by: Gábor Székely <szvgabor@gmail.com>
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

Default enable CFG_ENABLE_EMBEDDED_TESTS for OP-TEE os for Poplar.

Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>

In some cases depending on configurations etc 32MB is a bit tight for
the boot partition. By increasing it to 64MB you are in a better
position for not hitting the limit. Likewise you can store additional
kernel versions in the boot partition which can be useful when debugging
issues showing up in one kernel build, but not the other. Because of
this the help text should state 64MB instead of 32MB.

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

Conditionally enable TA C++ tests in the optee_test_ext Buildroot package.
Some toolchains may not support this feature [1] so it is best to let
the user decide.

common.mk enables the tests by default when $(COMPILER) is not clang,
assuming that the default GCC toolchain from toolchain.mk is used (which
works fine with the C++ tests). The command line option is
'make WITH_CXX_TESTS=y|n'.

Link: https://github.com/OP-TEE/optee_test/issues/458


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

Conditionally enable Thread Local Storage tests in the
optee_test_ext Buildroot package. Some toolchains may not support this
feature [1] so it is best to let the user decide.

common.mk enables the tests by default since the GCC toolchain from
toolchain.mk supports them. The command line option is
'make WITH_TLS_TESTS=y|n'.

Link: https://github.com/OP-TEE/optee_test/commit/30efcbeaf8864d0f2a5c4be593a5411001fab31b


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

By passing GP_PACKAGE=<path to GP-suite archive> optee_test is
configured to compile with the GlobalPlatform test suite. The test suite
is unpacked and patched in the build directory as part of the buildroot
process when building optee_test.

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

Updates the toolchain to Arm's GCC 9.2 [1]. Note the following
difference compared to the previous release (8.3), which is documented
in the release notes:

 "Changed toolchain naming convention to match standard target triplet
  naming convention, with vendor name being none."

For example, arm-linux-gnueabihf-gcc is now arm-none-linux-gnueabihf-gcc
and aarch64-linux-gnu-gcc is now aarch64-none-linux-gnu-gcc.

This renaming seems pretty much specific to the Arm build of GCC, and
the latest Debian and Ubuntu distributions provide GCC 9.x or 10.x
cross-compilers with the usual naming convention.

Therefore, and to limit the impact of the name change, let's simply
create symbolic links after the toolchain packages are extracted.

Link: [1] https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads


Signed-off-by: Jerome Forissier <jerome@forissier.org>
Tested-by: Jerome Forissier <jerome@forissier.org> (QEMU, QEMUv8, HiKey, HiKey960)
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (stm32mp1)

The optee_examples_ext and optee_test_ext packages are currently using
the python3 command found in $PATH. It is more correct to use the
Buildroot one.

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

Package [host-]python-pycrypto was removed in Buildroot release 2020.05
[1] and replaced with [host-]python3-pycryptodomex.

Link: [1] https://git.busybox.net/buildroot/commit/?id=7ef76ed32fcd447391e26d33a555ff5dab6dc48e


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

Remove check-clean target dependency in clean since meaningless
for stm32mp1 platform build environment.

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

Replace option partition-type with option partition-type-uuid as the
later is intended to GPT partitioning which is what stm32mp1 relies on.
This change prevents genimage tool, since its v13 release, from creating
a hybrid MBR partition table that is not supported by TF-A boot stage
used by the platform.

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

The optee_test TAs are built by a $(wildcard ...) loop. This is
unreliable because there is no guarantee that os_test_lib and
os_test_lib_dl will appear before os_test in the list. Yet os_test
depends on the libraries being built first.

Fix the issue by explicitely listing the libraries and TAs with
dependencies in the correct order, then using a wildcard for the other
TAs.

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

common.mk currently assumes that optee_os defaults to a 32-bit build
for the TEE core, in other words that CFG_ARM64_core is not set by
default and that only a 64-bit build requires setting CFG_ARM64_core=y.

Let's set CFG_ARM64_core=n explicitly when a 32-bit build is desired.
This will let platforms such as QEMUv8 (PLATFORM=vexpress-qemu_armv8a)
to select a 64-bit core by default in optee_os which makes more sense
since (1) build.git would not support 32-bit until parent commit
("qemu_v8: do not force COMPILE_S_KERNEL := 64"), and (2) 32-bit is
usually tested with QEMU (PLATFORM=vexpress-qemu_virt).

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