Merge pull request #1325 from michpappas/tf-issues#568_qemu_add_ENABLE_STACK_PROTECTOR ...

qemu: Add support for stack canary protection

Merge pull request #1331 from hzhuang1/reboot_delay ...

hikey960: add delay before reset

Merge pull request #1329 from antonio-nino-diaz-arm/an/rpi3-multi-console ...

rpi3: Migrate to the multi console API

Merge pull request #1335 from JoelHutton/jh/cleanup_void_pointers ...

Clean usage of void pointers to access symbols

Merge pull request #1336 from jonathanwright-ARM/jw/MISRA-init-arrays ...

psci: initialize array fully to comply with MISRA

hikey960: add delay before reset ...

If system is still accessing storage device, reboot operation
may cause data broken. So add the flush and delay operation
before system reset.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>

psci: initialize array fully to comply with MISRA ...

Initializes each element of the last_cpu_in_non_cpu_pd array in PSCI
stat implementation to -1, the reset value. This satisfies MISRA rule
9.3.

Previously, only the first element of the array was initialized to -1.

Change-Id: I666c71e6c073710c67c6d24c07a219b1feb5b773
Signed-off-by: Jonathan Wright <jonathan.wright@arm.com>

Clean usage of void pointers to access symbols ...

Void pointers have been used to access linker symbols, by declaring an
extern pointer, then taking the address of it. This limits symbols
values to aligned pointer values. To remove this restriction an
IMPORT_SYM macro has been introduced, which declares it as a char
pointer and casts it to the required type.

Change-Id: I89877fc3b13ed311817bb8ba79d4872b89bfd3b0
Signed-off-by: Joel Hutton <Joel.Hutton@Arm.com>

rpi3: Use new console APIs ...

Switch to the new console APIs enabled by setting MULTI_CONSOLE_API=1.

The crash console doesn't use this API, it uses internally the core
functions of the 16550 console.

`bl31_plat_runtime_setup` is no longer needed. When this platform port
was introduced, that function used to disable the console. It was needed
to override that behaviour. The new behaviour is to switch to the
runtime console. The console is registered for all scopes (boot, crash
and runtime) in `rpi3_console_init` so it is not needed to override the
default behaviour anymore.

Update documentation.

Change-Id: If2ee8f91044216183b7ef142e5c05ad6220ae92f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

Merge pull request #1323 from rockchip-linux/Fixes-rk3399-watchdog ...

rockchip/rk3399: save/restore watchdog register correctly

Merge pull request #1330 from michpappas/tf-issues#571_qemu_fix_MULTI_CONSOLE=0 ...

qemu: MULTI_CONSOLE_API=0 causes build error

qemu: MULTI_CONSOLE_API=0 causes build error ...

Add crash_console_init declaration to console.h
Only enable MULTI_CONSOLE_API for AArch64

Fixes ARM-software/tf-issues#571

Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>

Merge pull request #1280 from gitfineon/master ...

plat/hikey: split boot memory layout to dedicated file

drivers: ti: 16550: Implement console flush ...

Replace placeholder by actual implementation.

Change-Id: I0861b1ac5304b0d2d7c32d7d9a48bd985e258e92
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

Merge pull request #1324 from michpappas/tf-issues#567Platforms_cannot_override_ENABLE_STACK_PROTECTOR ...

Platforms cannot override ENABLE_STACK_PROTECTOR

Merge pull request #1321 from sandrine-bailleux-arm/topics/sb/fix-trusty-setup ...

Trusty: Fix sanity check on NS entry point

Merge pull request #1299 from michpappas/tf-issues#561_qemu_support_MULTI_CONSOLE ...

qemu: Support MULTI_CONSOLE_API

Merge pull request #1307 from wangfeng-64/master ...

FVP: change the method for translating MPIDR values to a linear indices

Merge pull request #1311 from jonathanwright-ARM/jw/MISRA-EOF-usage ...

stdlib: remove comparison with EOF macro to comply with MISRA

[PATCH 2/2] qemu: Support MULTI_CONSOLE_API ...

Add support for the new MULTI_CONSOLE_API

Crash information is now displayed in both the runtime and crash consoles,
if a crash occurs after the runtime console has been enabled

Enable MULTI_CONSOLE_API by default on qemu builds

Fixes ARM-software/tf-issues#561

Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>

Merge pull request #1293 from swarren/issue-551-followup ...

Don't make build results depend on dependency files

Merge pull request #1294 from iwishguo/master ...

Change PLATFORM_ROOT to TF_PLATFORM_ROOT

Merge pull request #1314 from antonio-nino-diaz-arm/an/smccc-header ...

Rename 'smcc' to 'smccc'

Merge pull request #1304 from antonio-nino-diaz-arm/an/fix-copyright ...

tegra: Use SPDX license identifier

Rename 'smcc' to 'smccc' ...

When the source code says 'SMCC' it is talking about the SMC Calling
Convention. The correct acronym is SMCCC. This affects a few definitions
and file names.

Some files have been renamed (smcc.h, smcc_helpers.h and smcc_macros.S)
but the old files have been kept for compatibility, they include the
new ones with an ERROR_DEPRECATED guard.

Change-Id: I78f94052a502436fdd97ca32c0fe86bd58173f2f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

Trusty: Fix sanity check on NS entry point ...

This patch fixes the sanity check on the non-secure entrypoint value
returned by bl31_plat_get_next_image_ep_info(). This issue has been
reported by Coverity Scan Online:

  CID 264893 (#1 of 1): Dereference null return value (NULL_RETURNS)
  Dereferencing a null pointer ns_ep_info.

Change-Id: Ia0f64d8c8b005f042608f1422ecbd42bc90b2fb4
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>

Fix SDEI link in readme.rst

Merge pull request #1316 from davidcunado-arm/dc/version_update ...

Release v1.5: Update minor version number to 5

Merge pull request #1322 from danh-arm/dh/v1.5-readme ...

Update readme.rst for v1.5 release

Merge pull request #1326 from JoelHutton/jh/user_guide_updates ...

Update user guide