[PATCH] fpga: zynqmp: Protect zynqmp_loads() for SPL

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

[PATCH] fpga: zynqmp: Protect zynqmp_loads() for SPL

Michal Simek-3
if conditions should match.

Fixes: a18d09ea384f ("fpga: zynqmp: Add secure bitstream loading for ZynqMP")
Signed-off-by: Michal Simek <[hidden email]>
---

 drivers/fpga/zynqmppl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index 03878d32ec1c..8ce140a2e1ab 100644
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -305,7 +305,7 @@ static int zynqmp_pcap_info(xilinx_desc *desc)
 
 struct xilinx_fpga_op zynqmp_op = {
  .load = zynqmp_load,
-#if defined CONFIG_CMD_FPGA_LOAD_SECURE
+#if defined(CONFIG_CMD_FPGA_LOAD_SECURE) && !defined(CONFIG_SPL_BUILD)
  .loads = zynqmp_loads,
 #endif
  .info = zynqmp_pcap_info,
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] fpga: zynqmp: Protect zynqmp_loads() for SPL

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

>
> if conditions should match.
>
> Fixes: a18d09ea384f ("fpga: zynqmp: Add secure bitstream loading for ZynqMP")
> Signed-off-by: Michal Simek <[hidden email]>
> ---
>
>  drivers/fpga/zynqmppl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
> index 03878d32ec1c..8ce140a2e1ab 100644
> --- a/drivers/fpga/zynqmppl.c
> +++ b/drivers/fpga/zynqmppl.c
> @@ -305,7 +305,7 @@ static int zynqmp_pcap_info(xilinx_desc *desc)
>
>  struct xilinx_fpga_op zynqmp_op = {
>         .load = zynqmp_load,
> -#if defined CONFIG_CMD_FPGA_LOAD_SECURE
> +#if defined(CONFIG_CMD_FPGA_LOAD_SECURE) && !defined(CONFIG_SPL_BUILD)
>         .loads = zynqmp_loads,
>  #endif
>         .info = zynqmp_pcap_info,
> --
> 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