| Message ID | 20180718074141.16539-3-luaraneda@gmail.com |
|---|---|
| State | RFC |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | arm: zynq: implement FPGA load from SPL | expand |
On 18.7.2018 09:41, Luis Araneda wrote: > Disable the use of function zynq_loadfs when compiling > the driver for the SPL, as the following filesystem > functions are not found by the linker: > - fs_set_blk_dev > - fs_read > - fs_set_blk_dev > - fs_read > - fs_read > > Signed-off-by: Luis Araneda <luaraneda@gmail.com> > --- > drivers/fpga/zynqpl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c > index fd37d18c7f..8e49c7010e 100644 > --- a/drivers/fpga/zynqpl.c > +++ b/drivers/fpga/zynqpl.c > @@ -410,7 +410,7 @@ static int zynq_load(xilinx_desc *desc, const void *buf, size_t bsize, > return FPGA_SUCCESS; > } > > -#if defined(CONFIG_CMD_FPGA_LOADFS) > +#if defined(CONFIG_CMD_FPGA_LOADFS) && !defined(CONFIG_SPL_BUILD) > static int zynq_loadfs(xilinx_desc *desc, const void *buf, size_t bsize, > fpga_fs_info *fsinfo) > { > @@ -493,7 +493,7 @@ static int zynq_loadfs(xilinx_desc *desc, const void *buf, size_t bsize, > > struct xilinx_fpga_op zynq_op = { > .load = zynq_load, > -#if defined(CONFIG_CMD_FPGA_LOADFS) > +#if defined(CONFIG_CMD_FPGA_LOADFS) && !defined(CONFIG_SPL_BUILD) > .loadfs = zynq_loadfs, > #endif > }; > This looks good. M
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c index fd37d18c7f..8e49c7010e 100644 --- a/drivers/fpga/zynqpl.c +++ b/drivers/fpga/zynqpl.c @@ -410,7 +410,7 @@ static int zynq_load(xilinx_desc *desc, const void *buf, size_t bsize, return FPGA_SUCCESS; } -#if defined(CONFIG_CMD_FPGA_LOADFS) +#if defined(CONFIG_CMD_FPGA_LOADFS) && !defined(CONFIG_SPL_BUILD) static int zynq_loadfs(xilinx_desc *desc, const void *buf, size_t bsize, fpga_fs_info *fsinfo) { @@ -493,7 +493,7 @@ static int zynq_loadfs(xilinx_desc *desc, const void *buf, size_t bsize, struct xilinx_fpga_op zynq_op = { .load = zynq_load, -#if defined(CONFIG_CMD_FPGA_LOADFS) +#if defined(CONFIG_CMD_FPGA_LOADFS) && !defined(CONFIG_SPL_BUILD) .loadfs = zynq_loadfs, #endif };
Disable the use of function zynq_loadfs when compiling the driver for the SPL, as the following filesystem functions are not found by the linker: - fs_set_blk_dev - fs_read - fs_set_blk_dev - fs_read - fs_read Signed-off-by: Luis Araneda <luaraneda@gmail.com> --- drivers/fpga/zynqpl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)