Merge "build_macros.mk: include assert and define loop macros" into integration

Merge "defaults.mk: default KEY_SIZE to 2048 in case of RSA algorithm" into integration

Merge changes from topic "ehf_common" into integration ...

* changes:
  plat: tegra: Use generic ehf defines
  ehf: use common priority level enumuration

Merge "spmd: remove assert for SPMC PC value" into integration

Merge "doc: Recommend using C rather than assembly language" into integration

Merge "SPE: Fix feature detection" into integration

Merge changes from topic "cot-parser" into integration ...

* changes:
  plat/arm: fvp: Increase BL2 maximum size
  lib: fconf: Implement a parser to populate CoT

Merge "doc: Correct CPACR.FPEN usage" into integration

plat/arm: fvp: Increase BL2 maximum size ...

Increased BL2 maximum size when CoT descriptors are placed
in device tree.

Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
Change-Id: I6466d2841e189e7f15eb4f1a8db070542893cb5b

lib: fconf: Implement a parser to populate CoT ...

Implemented a parser which populates the properties of
the CoT descriptors as per the binding document [1].
'COT_DESC_IN_DTB' build option is disabled by default and can
be enabled in future for all Arm platforms by making necessary
changes in the memory map.
Currently, this parser is tested only for FVP platform.

[1]:
https://trustedfirmware-a.readthedocs.io/en/latest/components/cot-binding.html

Change-Id: I2f911206087a1a2942aa728de151d2ac269d27cc
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>

Merge "doc: add description of "owner" field in SP layout file." into integration

Merge changes from topic "sami/834_fiptool_pack_issue_win_v1" into integration ...

* changes:
  Update makefile to build fiptool for Windows
  Fix fiptool packaging issue on windows

doc: add description of "owner" field in SP layout file. ...

Change-Id: Iedaa83ed546eb2476849a8d53f6e05b847a48b23
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>

Merge "fdts: corstone700: add NXP isp1763 node to device tree" into integration

Merge "rockchip: don't crash if we get an FDT we can't parse" into integration

SPE: Fix feature detection ...

Currently the feature test for the SPE extension requires the feature
bits in the ID_AA64DFR0 register to read exactly 0b0001.
However the architecture guarantees that any values greater than 0
indicate the presence of a feature, which is what we are after in
our spe_supported() function.

Change the comparison to include all values greater than 0.

This fixes SPE support in non-secure world on implementations which
include the Scalable Vector Extension (SVE), for instance on Zeus cores.

Change-Id: If6cbd1b72d6abb8a303e2c0a7839d508f071cdbe
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

build_macros.mk: include assert and define loop macros ...

Loop macros make it easier for developers to include new variables to
assert or define and also help code code readability on makefiles.

Change-Id: I0d21d6e67b3eca8976c4d856ac8ccc02c8bb5ffa
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>

Update makefile to build fiptool for Windows ...

Although support for building fiptool on a Windows host was present,
the binary was not built when the top level makefile was invoked.

This patch makes the necessary changes to the to support building of
fiptool on a Windows host PC from the main makefile.

Change-Id: I0c01ba237fa3010a027a1b324201131210cf4d7c
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>

Fix fiptool packaging issue on windows ...

Windows does not have a standard getopt implementation. To address
this an equivalent implementation has been provided in win_posix.c
However, the implementation has an issue with option processing as
described below.

Long option names may be abbreviated if the abbreviation is unique
or an exact match for some defined option.
Since some options can be substring of other options e.g. "scp-fw"
option is a substring of "scp-fwu-cfg", we need to identify if an
option is abbreviated and also check for uniqueness. Otherwise if
a user passes --scp-fw as an option, the "scp-fwu-cfg" option may
get selected, resulting in an incorrectly packaged FIP.

This issue has been be fixed by:
  - First searching for an exact match.
  - If exact match was not found search for a abbreviated match.
By doing this an incorrect option selection can be avoided.

Change-Id: I22f4e7a683f3df857f5b6f0783bf9b03a64a0bcc
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>

doc: Correct CPACR.FPEN usage ...

To avoid trapping from EL0/1, FPEN bits need to be set 0x3, not
clearing.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Change-Id: Ic34e9aeb876872883c5f040618ed6d50f21dacd0

Merge "libc: Import strlcat from FreeBSD project" into integration

Merge "libc: Add support for vsnprintf()" into integration

libc: Add support for vsnprintf() ...

It uses the existing implementation of snprintf() function

Change-Id: Ie59418564c2e415222e819cf322c34e9a4d1f336
Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>

Merge "Workaround for Neoverse N1 erratum 1868343" into integration

Merge "tc0: increase SCP_BL2 size to 128 kB" into integration

Merge "SPM: Get rid of uint32_t array representation of UUID" into integration

Merge "tools: Set the tool's default binary name" into integration

Workaround for Neoverse N1 erratum 1868343 ...

Neoverse N1 erratum 1868343 is a Cat B erratum, present in older
revisions of the Neoverse N1 processor core.  The workaround is to
set a bit in the CPUACTLR_EL1 system register, which delays instruction
fetch after branch misprediction. This workaround will have a small
impact on performance.

SDEN can be found here:
https://documentation-service.arm.com/static/5f2c130260a93e65927bc92f

Signed-off-by: John Powell <john.powell@arm.com>
Change-Id: I37da2b3b2da697701b883bff9a1eff2772352844

defaults.mk: default KEY_SIZE to 2048 in case of RSA algorithm ...

According to the documentation [1], KEY_SIZE defaults to 2048 when RSA
algorithm is chosen, so set this value on the make's defaults file.

[1] https://trustedfirmware-a.readthedocs.io/en/latest/getting_started/build-options.html

Change-Id: I030f98363198a752bc0dd03528f748de527d48d8
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>

Merge "plat/arm: rdn1edge: Correct mismatched parenthesis in makefile" into integration