diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-09-12 12:29:46 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-09-12 12:29:46 +0000 |
| commit | 5beeec7980ad683872c68e63471fb9d6a7c462f5 (patch) | |
| tree | 8ceb32d116c7678bae2b7206ffeacf845305d9b4 | |
| parent | 18eb0025b342387b716c35c47967bb12a0ad3bad (diff) | |
| parent | 705bed5db104e6aee9b3cc9d25776299581be49e (diff) | |
| download | platform_external_arm-trusted-firmware-5beeec7980ad683872c68e63471fb9d6a7c462f5.tar.gz platform_external_arm-trusted-firmware-5beeec7980ad683872c68e63471fb9d6a7c462f5.tar.bz2 platform_external_arm-trusted-firmware-5beeec7980ad683872c68e63471fb9d6a7c462f5.zip | |
Merge "plat: xilinx: zynqmp: Initialize IPI table from zynqmp_config_setup()" into integration
| -rw-r--r-- | plat/xilinx/zynqmp/aarch64/zynqmp_common.c | 6 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/platform.mk | 2 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/sip_svc_setup.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c index 8ff6c4360..ab5d95d1e 100644 --- a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c +++ b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -11,6 +11,7 @@ #include <drivers/generic_delay_timer.h> #include <lib/mmio.h> #include <lib/xlat_tables/xlat_tables.h> +#include <plat_ipi.h> #include <plat_private.h> #include <plat/common/platform.h> @@ -325,6 +326,9 @@ unsigned int zynqmp_get_bootmode(void) void zynqmp_config_setup(void) { + /* Configure IPI data for ZynqMP */ + zynqmp_ipi_config_table_init(); + zynqmp_print_platform_name(); generic_delay_timer_init(); } diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk index bd7bc08da..c34a51674 100644 --- a/plat/xilinx/zynqmp/platform.mk +++ b/plat/xilinx/zynqmp/platform.mk @@ -64,6 +64,7 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ plat/arm/common/arm_gicv2.c \ plat/common/plat_gicv2.c \ plat/xilinx/common/ipi.c \ + plat/xilinx/zynqmp/zynqmp_ipi.c \ plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S \ plat/xilinx/zynqmp/aarch64/zynqmp_common.c @@ -78,7 +79,6 @@ BL31_SOURCES += drivers/arm/cci/cci.c \ plat/xilinx/zynqmp/plat_startup.c \ plat/xilinx/zynqmp/plat_topology.c \ plat/xilinx/zynqmp/sip_svc_setup.c \ - plat/xilinx/zynqmp/zynqmp_ipi.c \ plat/xilinx/zynqmp/pm_service/pm_svc_main.c \ plat/xilinx/zynqmp/pm_service/pm_api_sys.c \ plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c \ diff --git a/plat/xilinx/zynqmp/sip_svc_setup.c b/plat/xilinx/zynqmp/sip_svc_setup.c index edb81f5c3..9b182749c 100644 --- a/plat/xilinx/zynqmp/sip_svc_setup.c +++ b/plat/xilinx/zynqmp/sip_svc_setup.c @@ -9,7 +9,6 @@ #include <common/runtime_svc.h> #include <tools_share/uuid.h> -#include <plat_ipi.h> #include "ipi_mailbox_svc.h" #include "pm_svc_main.h" @@ -41,9 +40,6 @@ DEFINE_SVC_UUID2(zynqmp_sip_uuid, */ static int32_t sip_svc_setup(void) { - /* Configure IPI data for ZynqMP */ - zynqmp_ipi_config_table_init(); - /* PM implementation as SiP Service */ pm_setup(); |