git.openpandora.org
/
pandora-u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
29bd8ad
)
fpga: zynqmp: Protect zynqmp_loads() for SPL
author
Michal Simek
<michal.simek@xilinx.com>
Thu, 10 Sep 2020 10:57:16 +0000
(12:57 +0200)
committer
Michal Simek
<michal.simek@xilinx.com>
Wed, 23 Sep 2020 08:31:41 +0000
(10:31 +0200)
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
patch
|
blob
|
history
diff --git
a/drivers/fpga/zynqmppl.c
b/drivers/fpga/zynqmppl.c
index
03878d3
..
8ce140a
100644
(file)
--- 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,