* [PATCH] fpga: zynqmp: Protect zynqmp_loads() for SPL
@ 2020-09-10 11:02 Michal Simek
2020-09-23 12:27 ` Michal Simek
0 siblings, 1 reply; 2+ messages in thread
From: Michal Simek @ 2020-09-10 11:02 UTC (permalink / raw)
To: u-boot
if conditions should match.
Fixes: a18d09ea384f ("fpga: zynqmp: Add secure bitstream loading for ZynqMP")
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] fpga: zynqmp: Protect zynqmp_loads() for SPL
2020-09-10 11:02 [PATCH] fpga: zynqmp: Protect zynqmp_loads() for SPL Michal Simek
@ 2020-09-23 12:27 ` Michal Simek
0 siblings, 0 replies; 2+ messages in thread
From: Michal Simek @ 2020-09-23 12:27 UTC (permalink / raw)
To: u-boot
?t 10. 9. 2020 v 13:02 odes?latel Michal Simek <michal.simek@xilinx.com> napsal:
>
> if conditions should match.
>
> Fixes: a18d09ea384f ("fpga: zynqmp: Add secure bitstream loading for ZynqMP")
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-23 12:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-10 11:02 [PATCH] fpga: zynqmp: Protect zynqmp_loads() for SPL Michal Simek
2020-09-23 12:27 ` Michal Simek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.