diff mbox series

arm64: zynqmp: Change bl2_plat_get_bl31_params() guarding

Message ID a7bd675da27d5289e57d8456d3395aba952c82af.1599131296.git.michal.simek@xilinx.com
State Accepted
Commit 96a60c03b9756dfb9fb1c2fd72a25cdddbeef150
Delegated to: Michal Simek
Headers show
Series arm64: zynqmp: Change bl2_plat_get_bl31_params() guarding | expand

Commit Message

Michal Simek Sept. 3, 2020, 11:08 a.m. UTC
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 <michal.simek@xilinx.com>
---

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

Comments

Michal Simek Sept. 23, 2020, 12:08 p.m. UTC | #1
čt 3. 9. 2020 v 13:08 odesílatel Michal Simek <michal.simek@xilinx.com> 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 <michal.simek@xilinx.com>
> ---
>
>  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
diff mbox series

Patch

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)