| Message ID | 7de1e3cdae59310a734193dbe3ecafbb6a1beb52.1599735722.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | a798b8aaf322f5c7818a1d963d63b7516dd5056f |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | fpga: zynqmp: Protect zynqmp_loads() for SPL | expand |
č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
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,
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(-)