Message ID | 1532591656-20142-4-git-send-email-tien.fong.chee@intel.com |
---|---|
State | Deferred |
Delegated to: | Tom Rini |
Headers | show |
Series | Example of using generic FS loader with FPGA manager | expand |
On 26.7.2018 09:54, tien.fong.chee@intel.com wrote: > From: Tien Fong Chee <tien.fong.chee@intel.com> > > Add code necessary into the FPGA driver framework in U-Boot > so it can be used via the 'fpga' command for programing Arria 10 > SoCFPGA. > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > --- > cmd/fpga.c | 2 +- > drivers/fpga/altera.c | 41 +++++++++++++++++++++++++++++++++-------- > drivers/fpga/fpga.c | 8 ++++++++ > include/altera.h | 2 ++ > include/fpga.h | 2 ++ > 5 files changed, 46 insertions(+), 9 deletions(-) > > diff --git a/cmd/fpga.c b/cmd/fpga.c > index 14ad4e5..207cec3 100644 > --- a/cmd/fpga.c > +++ b/cmd/fpga.c > @@ -362,7 +362,7 @@ U_BOOT_CMD(fpga, 6, 1, do_fpga, > "(Xilinx only)\n" > #endif > #if defined(CONFIG_CMD_FPGA_LOADFS) > - "Load device from filesystem (FAT by default) (Xilinx only)\n" > + "Load device from filesystem (FAT by default)\n" > " loadfs [dev] [address] [image size] [blocksize] <interface>\n" > " [<dev[:part]>] <filename>\n" > #endif > diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c > index 9605554..3c9474c 100644 > --- a/drivers/fpga/altera.c > +++ b/drivers/fpga/altera.c > @@ -12,6 +12,7 @@ > */ > #include <common.h> > #include <errno.h> > +#include <altera.h> /* altera specific definitions */ > #include <ACEX1K.h> > #include <stratixII.h> > > @@ -22,25 +23,31 @@ static const struct altera_fpga { > enum altera_family family; > const char *name; > int (*load)(Altera_desc *, const void *, size_t); > + int (*loadfs)(Altera_desc *, const void *, size_t, fpga_fs_info *); when you put this as last then you don't need to fill NULLs below. > int (*dump)(Altera_desc *, const void *, size_t); > int (*info)(Altera_desc *); > } altera_fpga[] = { > #if defined(CONFIG_FPGA_ACEX1K) > - { Altera_ACEX1K, "ACEX1K", ACEX1K_load, ACEX1K_dump, ACEX1K_info }, > - { Altera_CYC2, "ACEX1K", ACEX1K_load, ACEX1K_dump, ACEX1K_info }, > + { Altera_ACEX1K, "ACEX1K", ACEX1K_load, NULL, ACEX1K_dump, > + ACEX1K_info }, > + { Altera_CYC2, "ACEX1K", ACEX1K_load, NULL, ACEX1K_dump, > + ACEX1K_info }, > #elif defined(CONFIG_FPGA_CYCLON2) > - { Altera_ACEX1K, "CycloneII", CYC2_load, CYC2_dump, CYC2_info }, > - { Altera_CYC2, "CycloneII", CYC2_load, CYC2_dump, CYC2_info }, > + { Altera_ACEX1K, "CycloneII", CYC2_load, NULL, CYC2_dump, CYC2_info }, > + { Altera_CYC2, "CycloneII", CYC2_load, NULL, CYC2_dump, CYC2_info }, > #endif > #if defined(CONFIG_FPGA_STRATIX_II) > - { Altera_StratixII, "StratixII", StratixII_load, > + { Altera_StratixII, "StratixII", StratixII_load, NULL, > StratixII_dump, StratixII_info }, > #endif > #if defined(CONFIG_FPGA_STRATIX_V) > - { Altera_StratixV, "StratixV", stratixv_load, NULL, NULL }, > + { Altera_StratixV, "StratixV", stratixv_load, NULL, NULL, NULL }, > #endif > -#if defined(CONFIG_FPGA_SOCFPGA) > - { Altera_SoCFPGA, "SoC FPGA", socfpga_load, NULL, NULL }, > +#if defined(CONFIG_FPGA_SOCFPGA) && defined(CONFIG_CMD_FPGA_LOADFS) > + { Altera_SoCFPGA, "SoC FPGA", socfpga_load, socfpga_loadfs, NULL, > + NULL }, > +#elif defined(CONFIG_FPGA_SOCFPGA) > + { Altera_SoCFPGA, "SoC FPGA", socfpga_load, NULL, NULL, NULL }, > #endif > }; > > @@ -173,3 +180,21 @@ int altera_info(Altera_desc *desc) > > return FPGA_SUCCESS; > } > + > +#if defined(CONFIG_CMD_FPGA_LOADFS) > +int altera_loadfs(Altera_desc *desc, const void *buf, size_t bsize, > + fpga_fs_info *fpga_fsinfo) > +{ > + const struct altera_fpga *fpga = altera_desc_to_fpga(desc, __func__); > + > + if (!fpga) > + return FPGA_FAIL; > + > + debug_cond(FPGA_DEBUG, "%s: Launching the %s FS Loader...\n", > + __func__, fpga->name); > + if (fpga->loadfs) > + return fpga->loadfs(desc, buf, bsize, fpga_fsinfo); > + > + return -EINVAL; > +} > +#endif > diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c > index 55bdf9e..67b772d 100644 > --- a/drivers/fpga/fpga.c > +++ b/drivers/fpga/fpga.c > @@ -207,6 +207,14 @@ int fpga_fsload(int devnum, const void *buf, size_t size, > fpga_no_sup((char *)__func__, "Xilinx devices"); > #endif > break; > +#if defined(CONFIG_FPGA_ALTERA) > + case fpga_altera: > + ret_val = altera_loadfs(desc->devdesc, buf, size, > + fpga_fsinfo); > +#else > + fpga_no_sup((char *)__func__, "Altera devices"); > +#endif > + break; > default: > printf("%s: Invalid or unsupported device type %d\n", > __func__, desc->devtype); > diff --git a/include/altera.h b/include/altera.h > index cf0c021..b641b8a 100644 > --- a/include/altera.h > +++ b/include/altera.h > @@ -114,6 +114,8 @@ typedef struct { > > #ifdef CONFIG_FPGA_SOCFPGA > int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size); > +int socfpga_loadfs(Altera_desc *desc, const void *buf, size_t bsize, > + fpga_fs_info *fpga_fsinfo); > #endif > > #ifdef CONFIG_FPGA_STRATIX_V > diff --git a/include/fpga.h b/include/fpga.h > index f444093..eee6fed 100644 > --- a/include/fpga.h > +++ b/include/fpga.h > @@ -56,8 +56,10 @@ const fpga_desc *const fpga_get_desc(int devnum); > int fpga_is_partial_data(int devnum, size_t img_len); > int fpga_load(int devnum, const void *buf, size_t bsize, > bitstream_type bstype); > +#if defined(CONFIG_CMD_FPGA_LOADFS) > int fpga_fsload(int devnum, const void *buf, size_t size, > fpga_fs_info *fpga_fsinfo); > +#endif > int fpga_loadbitstream(int devnum, char *fpgadata, size_t size, > bitstream_type bstype); > int fpga_dump(int devnum, const void *buf, size_t bsize); > M
diff --git a/cmd/fpga.c b/cmd/fpga.c index 14ad4e5..207cec3 100644 --- a/cmd/fpga.c +++ b/cmd/fpga.c @@ -362,7 +362,7 @@ U_BOOT_CMD(fpga, 6, 1, do_fpga, "(Xilinx only)\n" #endif #if defined(CONFIG_CMD_FPGA_LOADFS) - "Load device from filesystem (FAT by default) (Xilinx only)\n" + "Load device from filesystem (FAT by default)\n" " loadfs [dev] [address] [image size] [blocksize] <interface>\n" " [<dev[:part]>] <filename>\n" #endif diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c index 9605554..3c9474c 100644 --- a/drivers/fpga/altera.c +++ b/drivers/fpga/altera.c @@ -12,6 +12,7 @@ */ #include <common.h> #include <errno.h> +#include <altera.h> /* altera specific definitions */ #include <ACEX1K.h> #include <stratixII.h> @@ -22,25 +23,31 @@ static const struct altera_fpga { enum altera_family family; const char *name; int (*load)(Altera_desc *, const void *, size_t); + int (*loadfs)(Altera_desc *, const void *, size_t, fpga_fs_info *); int (*dump)(Altera_desc *, const void *, size_t); int (*info)(Altera_desc *); } altera_fpga[] = { #if defined(CONFIG_FPGA_ACEX1K) - { Altera_ACEX1K, "ACEX1K", ACEX1K_load, ACEX1K_dump, ACEX1K_info }, - { Altera_CYC2, "ACEX1K", ACEX1K_load, ACEX1K_dump, ACEX1K_info }, + { Altera_ACEX1K, "ACEX1K", ACEX1K_load, NULL, ACEX1K_dump, + ACEX1K_info }, + { Altera_CYC2, "ACEX1K", ACEX1K_load, NULL, ACEX1K_dump, + ACEX1K_info }, #elif defined(CONFIG_FPGA_CYCLON2) - { Altera_ACEX1K, "CycloneII", CYC2_load, CYC2_dump, CYC2_info }, - { Altera_CYC2, "CycloneII", CYC2_load, CYC2_dump, CYC2_info }, + { Altera_ACEX1K, "CycloneII", CYC2_load, NULL, CYC2_dump, CYC2_info }, + { Altera_CYC2, "CycloneII", CYC2_load, NULL, CYC2_dump, CYC2_info }, #endif #if defined(CONFIG_FPGA_STRATIX_II) - { Altera_StratixII, "StratixII", StratixII_load, + { Altera_StratixII, "StratixII", StratixII_load, NULL, StratixII_dump, StratixII_info }, #endif #if defined(CONFIG_FPGA_STRATIX_V) - { Altera_StratixV, "StratixV", stratixv_load, NULL, NULL }, + { Altera_StratixV, "StratixV", stratixv_load, NULL, NULL, NULL }, #endif -#if defined(CONFIG_FPGA_SOCFPGA) - { Altera_SoCFPGA, "SoC FPGA", socfpga_load, NULL, NULL }, +#if defined(CONFIG_FPGA_SOCFPGA) && defined(CONFIG_CMD_FPGA_LOADFS) + { Altera_SoCFPGA, "SoC FPGA", socfpga_load, socfpga_loadfs, NULL, + NULL }, +#elif defined(CONFIG_FPGA_SOCFPGA) + { Altera_SoCFPGA, "SoC FPGA", socfpga_load, NULL, NULL, NULL }, #endif }; @@ -173,3 +180,21 @@ int altera_info(Altera_desc *desc) return FPGA_SUCCESS; } + +#if defined(CONFIG_CMD_FPGA_LOADFS) +int altera_loadfs(Altera_desc *desc, const void *buf, size_t bsize, + fpga_fs_info *fpga_fsinfo) +{ + const struct altera_fpga *fpga = altera_desc_to_fpga(desc, __func__); + + if (!fpga) + return FPGA_FAIL; + + debug_cond(FPGA_DEBUG, "%s: Launching the %s FS Loader...\n", + __func__, fpga->name); + if (fpga->loadfs) + return fpga->loadfs(desc, buf, bsize, fpga_fsinfo); + + return -EINVAL; +} +#endif diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c index 55bdf9e..67b772d 100644 --- a/drivers/fpga/fpga.c +++ b/drivers/fpga/fpga.c @@ -207,6 +207,14 @@ int fpga_fsload(int devnum, const void *buf, size_t size, fpga_no_sup((char *)__func__, "Xilinx devices"); #endif break; +#if defined(CONFIG_FPGA_ALTERA) + case fpga_altera: + ret_val = altera_loadfs(desc->devdesc, buf, size, + fpga_fsinfo); +#else + fpga_no_sup((char *)__func__, "Altera devices"); +#endif + break; default: printf("%s: Invalid or unsupported device type %d\n", __func__, desc->devtype); diff --git a/include/altera.h b/include/altera.h index cf0c021..b641b8a 100644 --- a/include/altera.h +++ b/include/altera.h @@ -114,6 +114,8 @@ typedef struct { #ifdef CONFIG_FPGA_SOCFPGA int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size); +int socfpga_loadfs(Altera_desc *desc, const void *buf, size_t bsize, + fpga_fs_info *fpga_fsinfo); #endif #ifdef CONFIG_FPGA_STRATIX_V diff --git a/include/fpga.h b/include/fpga.h index f444093..eee6fed 100644 --- a/include/fpga.h +++ b/include/fpga.h @@ -56,8 +56,10 @@ const fpga_desc *const fpga_get_desc(int devnum); int fpga_is_partial_data(int devnum, size_t img_len); int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype); +#if defined(CONFIG_CMD_FPGA_LOADFS) int fpga_fsload(int devnum, const void *buf, size_t size, fpga_fs_info *fpga_fsinfo); +#endif int fpga_loadbitstream(int devnum, char *fpgadata, size_t size, bitstream_type bstype); int fpga_dump(int devnum, const void *buf, size_t bsize);