Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 17:44:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(xilinx): dcc console tests failing" into integration

Browse source
This commit is contained in:
Yann Gautier 2025-01-23 11:19:54 +01:00 • committed by TrustedFirmware Code Review
commit 5e36111422
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plat/amd/versal2/bl31_setup.c
View file

@ -127,14 +127,14 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
uart_clock = get_uart_clk();
/* Initialize the platform config for future decision making */
config_setup();
setup_console();
NOTICE("TF-A running on %s %d.%d\n", board_name_decode(),
platform_version / 10U, platform_version % 10U);
/* Initialize the platform config for future decision making */
config_setup();
/*
* Do initial security configuration to allow DRAM/device access. On
* Base only DRAM security is programmable (via TrustZone), but

5
plat/xilinx/versal_net/bl31_versal_net_setup.c
View file

@ -117,6 +117,9 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
set_cnt_freq();
/* Initialize the platform config for future decision making */
versal_net_config_setup();
setup_console();
NOTICE("TF-A running on %s %d.%d\n", board_name_decode(),
@ -124,8 +127,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
versal_net_setup_qos();
/* Initialize the platform config for future decision making */
versal_net_config_setup();
/*
* Do initial security configuration to allow DRAM/device access. On

11
plat/xilinx/zynqmp/aarch64/zynqmp_common.c
View file

@ -9,7 +9,6 @@
#include <string.h>
#include <common/debug.h>
#include <drivers/generic_delay_timer.h>
#include <lib/mmio.h>
#include <lib/smccc.h>
#include <lib/xlat_tables/xlat_tables_v2.h>
@ -389,20 +388,10 @@ uint32_t zynqmp_get_bootmode(void)
void zynqmp_config_setup(void)
{
uint64_t counter_freq;
/* Configure IPI data for ZynqMP */
zynqmp_ipi_config_table_init();
zynqmp_print_platform_name();
/* Configure counter frequency */
counter_freq = read_cntfrq_el0();
if (counter_freq == ZYNQMP_DEFAULT_COUNTER_FREQ) {
write_cntfrq_el0(plat_get_syscnt_freq2());
}
generic_delay_timer_init();
}
uint32_t plat_get_syscnt_freq2(void)

10
plat/xilinx/zynqmp/bl31_zynqmp_setup.c
View file

@ -13,6 +13,7 @@
#include <common/debug.h>
#include <common/fdt_fixup.h>
#include <common/fdt_wrappers.h>
#include <drivers/generic_delay_timer.h>
#include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables_v2.h>
#include <libfdt.h>
@ -77,6 +78,15 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
(void)arg2;
(void)arg3;
uint64_t tfa_handoff_addr;
uint64_t counter_freq;
/* Configure counter frequency */
counter_freq = read_cntfrq_el0();
if (counter_freq == ZYNQMP_DEFAULT_COUNTER_FREQ) {
write_cntfrq_el0(plat_get_syscnt_freq2());
}
generic_delay_timer_init();
setup_console();