Commit f097fb70 authored by Sandrine Bailleux's avatar Sandrine Bailleux Committed by TrustedFirmware Code Review
Browse files

Merge changes from topic "tegra-downstream-03122020" into integration

* changes:
  Tegra: assembly version of the 'plat_core_pos_by_mpidr' handler
  Tegra194: reset power state info for CPUs
  tlkd: remove system off/reset handlers
  Tegra186: system resume from TZSRAM memory
  Tegra186: disable PROGRAMMABLE_RESET_ADDRESS
  Tegra210: SE: switch SE clock source to CLK_M
  Tegra: increase platform assert logging level to VERBOSE
  spd: trusty: disable error messages seen during boot
  Tegra194: enable dual execution for EL2 and EL3
  Tegra: aarch64: calculate core position from one place
  Tegra194: Update t194_nvg.h to v6.7
parents c9796852 0ac1bf72
...@@ -413,7 +413,7 @@ static int32_t trusty_setup(void) ...@@ -413,7 +413,7 @@ static int32_t trusty_setup(void)
/* Get trusty's entry point info */ /* Get trusty's entry point info */
ep_info = bl31_plat_get_next_image_ep_info(SECURE); ep_info = bl31_plat_get_next_image_ep_info(SECURE);
if (ep_info == NULL) { if (ep_info == NULL) {
INFO("Trusty image missing.\n"); VERBOSE("Trusty image missing.\n");
return -1; return -1;
} }
...@@ -466,7 +466,7 @@ static int32_t trusty_setup(void) ...@@ -466,7 +466,7 @@ static int32_t trusty_setup(void)
trusty_fiq_handler, trusty_fiq_handler,
flags); flags);
if (ret != 0) { if (ret != 0) {
ERROR("trusty: failed to register fiq handler, ret = %d\n", ret); VERBOSE("trusty: failed to register fiq handler, ret = %d\n", ret);
} }
if (aarch32) { if (aarch32) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment