[PATCH] arm64: zynqmp: Change bl2_plat_get_bl31_params() guarding

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] arm64: zynqmp: Change bl2_plat_get_bl31_params() guarding

Michal Simek-3
It was protected just for SPL_OS_BOOT but this function is only called when
SPL_ATF is enabled that's why change macro name.

Signed-off-by: Michal Simek <[hidden email]>
---

 arch/arm/mach-zynqmp/handoff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-zynqmp/handoff.c b/arch/arm/mach-zynqmp/handoff.c
index 64e5320acc68..7d7ab9da6ec2 100644
--- a/arch/arm/mach-zynqmp/handoff.c
+++ b/arch/arm/mach-zynqmp/handoff.c
@@ -65,7 +65,7 @@ struct xfsbl_atf_handoff_params {
  struct xfsbl_partition partition[FSBL_MAX_PARTITIONS];
 };
 
-#ifdef CONFIG_SPL_OS_BOOT
+#ifdef CONFIG_SPL_ATF
 struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl32_entry,
      uintptr_t bl33_entry,
      uintptr_t fdt_addr)
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] arm64: zynqmp: Change bl2_plat_get_bl31_params() guarding

Michal Simek-4
čt 3. 9. 2020 v 13:08 odesílatel Michal Simek <[hidden email]> napsal:

>
> It was protected just for SPL_OS_BOOT but this function is only called when
> SPL_ATF is enabled that's why change macro name.
>
> Signed-off-by: Michal Simek <[hidden email]>
> ---
>
>  arch/arm/mach-zynqmp/handoff.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-zynqmp/handoff.c b/arch/arm/mach-zynqmp/handoff.c
> index 64e5320acc68..7d7ab9da6ec2 100644
> --- a/arch/arm/mach-zynqmp/handoff.c
> +++ b/arch/arm/mach-zynqmp/handoff.c
> @@ -65,7 +65,7 @@ struct xfsbl_atf_handoff_params {
>         struct xfsbl_partition partition[FSBL_MAX_PARTITIONS];
>  };
>
> -#ifdef CONFIG_SPL_OS_BOOT
> +#ifdef CONFIG_SPL_ATF
>  struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl32_entry,
>                                              uintptr_t bl33_entry,
>                                              uintptr_t fdt_addr)
> --
> 2.28.0
>

Applied.
M

--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs