diff options
author | Jolly Shah <jollys@xilinx.com> | 2019-01-08 11:10:47 -0800 |
---|---|---|
committer | Jolly Shah <jollys@xilinx.com> | 2019-01-09 12:05:13 -0800 |
commit | 31c3842ee86e5e98a1f441e1373906954dbcdf9f (patch) | |
tree | 6c8f3394e4fc5bc89ca3ea2418c39ecc6cdbb1f6 /plat/xilinx | |
parent | 300afb387ea3ce588a9b4c6746316bf9bc55dd56 (diff) | |
download | arm-trusted-firmware-31c3842ee86e5e98a1f441e1373906954dbcdf9f.tar.gz |
plat: xilinx: zynqmp: Move zynqmp_private.h to include directory
Move zynqmp_private.h to platform specific include directory.
Also, rename it to plat_private.h instead of having platform
name. So, it can be used to common source files which needs
platform specific data.
Signed-off-by: Tejas Patel <tejas.patel@xilinx.com>
Reviewed-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Jolly Shah <jollys@xilinx.com>
Diffstat (limited to 'plat/xilinx')
-rw-r--r-- | plat/xilinx/zynqmp/aarch64/zynqmp_common.c | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 3 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/include/plat_private.h (renamed from plat/xilinx/zynqmp/zynqmp_private.h) | 6 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c | 4 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/plat_psci.c | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/plat_startup.c | 4 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/plat_zynqmp.c | 3 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_ipi.c | 4 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_svc_main.c | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/tsp/tsp_plat_setup.c | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/zynqmp_ipi.c | 4 |
11 files changed, 17 insertions, 19 deletions
diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c index 23c02e068..8ff6c4360 100644 --- a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c +++ b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c @@ -11,9 +11,9 @@ #include <drivers/generic_delay_timer.h> #include <lib/mmio.h> #include <lib/xlat_tables/xlat_tables.h> +#include <plat_private.h> #include <plat/common/platform.h> -#include "../zynqmp_private.h" #include "pm_api_sys.h" /* diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 01cd781ff..8ecd6d7af 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -12,10 +12,9 @@ #include <common/debug.h> #include <drivers/console.h> #include <plat_arm.h> +#include <plat_private.h> #include <plat/common/platform.h> -#include "zynqmp_private.h" - #define BL31_END (unsigned long)(&__BL31_END__) static entry_point_info_t bl32_image_ep_info; diff --git a/plat/xilinx/zynqmp/zynqmp_private.h b/plat/xilinx/zynqmp/include/plat_private.h index a8ebcebee..99d0bc673 100644 --- a/plat/xilinx/zynqmp/zynqmp_private.h +++ b/plat/xilinx/zynqmp/include/plat_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ZYNQMP_PRIVATE_H -#define ZYNQMP_PRIVATE_H +#ifndef PLAT_PRIVATE_H +#define PLAT_PRIVATE_H #include <stdint.h> @@ -39,4 +39,4 @@ int request_intr_type_el3(uint32_t, interrupt_type_handler_t); enum fsbl_handoff fsbl_atf_handover(entry_point_info_t *bl32_image_ep_info, entry_point_info_t *bl33_image_ep_info); -#endif /* ZYNQMP_PRIVATE_H */ +#endif /* PLAT_PRIVATE_H */ diff --git a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c index 11f382a05..3aa0b75d5 100644 --- a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c +++ b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -15,10 +15,10 @@ #include <common/runtime_svc.h> #include <lib/bakery_lock.h> #include <lib/mmio.h> +#include <plat_private.h> #include "ipi_mailbox_svc.h" #include "../zynqmp_ipi.h" -#include "../zynqmp_private.h" #include "../../../services/spd/trusty/smcall.h" /********************************************************************* diff --git a/plat/xilinx/zynqmp/plat_psci.c b/plat/xilinx/zynqmp/plat_psci.c index 4183979a2..8522d3e6c 100644 --- a/plat/xilinx/zynqmp/plat_psci.c +++ b/plat/xilinx/zynqmp/plat_psci.c @@ -12,12 +12,12 @@ #include <drivers/arm/gicv2.h> #include <lib/mmio.h> #include <lib/psci/psci.h> +#include <plat_private.h> #include <plat/common/platform.h> #include <plat_arm.h> #include "pm_api_sys.h" #include "pm_client.h" -#include "zynqmp_private.h" uintptr_t zynqmp_sec_entry; diff --git a/plat/xilinx/zynqmp/plat_startup.c b/plat/xilinx/zynqmp/plat_startup.c index 03f0e3d82..cd2c3bac6 100644 --- a/plat/xilinx/zynqmp/plat_startup.c +++ b/plat/xilinx/zynqmp/plat_startup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,9 +9,9 @@ #include <arch_helpers.h> #include <common/debug.h> #include <lib/mmio.h> +#include <plat_private.h> #include "zynqmp_def.h" -#include "zynqmp_private.h" /* * ATFHandoffParams diff --git a/plat/xilinx/zynqmp/plat_zynqmp.c b/plat/xilinx/zynqmp/plat_zynqmp.c index ad18aafc3..906ce1b7f 100644 --- a/plat/xilinx/zynqmp/plat_zynqmp.c +++ b/plat/xilinx/zynqmp/plat_zynqmp.c @@ -4,10 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <plat_private.h> #include <plat/common/platform.h> -#include "zynqmp_private.h" - int plat_core_pos_by_mpidr(u_register_t mpidr) { if (mpidr & MPIDR_CLUSTER_MASK) diff --git a/plat/xilinx/zynqmp/pm_service/pm_ipi.c b/plat/xilinx/zynqmp/pm_service/pm_ipi.c index b3d833dfe..66393ef30 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_ipi.c +++ b/plat/xilinx/zynqmp/pm_service/pm_ipi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,10 +7,10 @@ #include <arch_helpers.h> #include <lib/bakery_lock.h> #include <lib/mmio.h> +#include <plat_private.h> #include <plat/common/platform.h> #include "../zynqmp_ipi.h" -#include "../zynqmp_private.h" #include "pm_ipi.h" /* IPI message buffers */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c index 0b8fc2352..faa282745 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c +++ b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c @@ -20,7 +20,7 @@ #include <plat/common/platform.h> #endif -#include "../zynqmp_private.h" +#include <plat_private.h> #include "pm_api_sys.h" #include "pm_client.h" #include "pm_ipi.h" diff --git a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c index 25359f91a..97718d656 100644 --- a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c +++ b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c @@ -9,9 +9,9 @@ #include <drivers/console.h> #include <plat_arm.h> +#include <plat_private.h> #include <platform_tsp.h> -#include "../zynqmp_private.h" #define BL32_END (unsigned long)(&__BL32_END__) diff --git a/plat/xilinx/zynqmp/zynqmp_ipi.c b/plat/xilinx/zynqmp/zynqmp_ipi.c index 54b18380d..2830ea3a3 100644 --- a/plat/xilinx/zynqmp/zynqmp_ipi.c +++ b/plat/xilinx/zynqmp/zynqmp_ipi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -15,9 +15,9 @@ #include <common/runtime_svc.h> #include <lib/bakery_lock.h> #include <lib/mmio.h> +#include <plat_private.h> #include "zynqmp_ipi.h" -#include "../zynqmp_private.h" /********************************************************************* * Macros definitions |