Re: [PATCH v3 1/4] fpga: dfl: reorganize to subdir layout

Luca Ceresoli
2021-06-14T09:28:52Z

Hi Tom,

On 11/06/21 18:21, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
>
> Follow drivers/net/ethernet/ which has control configs
> NET_VENDOR_BLA that map to drivers/net/ethernet/bla
> Since fpgas do not have many vendors, drop the 'VENDOR' and use
> FPGA_BLA.
>
> There are several new subdirs
> altera/
> dfl/
> lattice/
> xilinx/
>
> Each subdir has a Kconfig that has a new/reused
>
> if FPGA_BLA
> ... existing configs ...
> endif FPGA_BLA
>
> Which is sourced into the main fpga/Kconfig
>
> Each subdir has a Makefile whose transversal is controlled in the
> fpga/Makefile by
>
> obj-$(CONFIG_FPGA_BLA) += bla/
>
> This is the dfl/ subdir part.
>
> Create a dfl/ subdir
> Move dfl-* files to it.
> Add a Kconfig and Makefile
>
> Because FPGA_DFL is now used in dfl/Kconfig in a if/endif
> block, all the other configs in dfl/Kconfig implicitly depend
> on FPGA_DFL. So the explicit dependence can be removed. Also
> since FPGA_DFL depends on HAS_IOMEM, it can be removed from the
> other configs.
>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
> MAINTAINERS | 2 +-
> drivers/fpga/Kconfig | 80 +-------------------
> drivers/fpga/Makefile | 18 +----
> drivers/fpga/dfl/Kconfig | 83 +++++++++++++++++++++
> drivers/fpga/dfl/Makefile | 16 ++++
> drivers/fpga/{ => dfl}/dfl-afu-dma-region.c | 0
> drivers/fpga/{ => dfl}/dfl-afu-error.c | 0
> drivers/fpga/{ => dfl}/dfl-afu-main.c | 0
> drivers/fpga/{ => dfl}/dfl-afu-region.c | 0
> drivers/fpga/{ => dfl}/dfl-afu.h | 0
> drivers/fpga/{ => dfl}/dfl-fme-br.c | 0
> drivers/fpga/{ => dfl}/dfl-fme-error.c | 0
> drivers/fpga/{ => dfl}/dfl-fme-main.c | 0
> drivers/fpga/{ => dfl}/dfl-fme-mgr.c | 0
> drivers/fpga/{ => dfl}/dfl-fme-perf.c | 0
> drivers/fpga/{ => dfl}/dfl-fme-pr.c | 0
> drivers/fpga/{ => dfl}/dfl-fme-pr.h | 0
> drivers/fpga/{ => dfl}/dfl-fme-region.c | 0
> drivers/fpga/{ => dfl}/dfl-fme.h | 0
> drivers/fpga/{ => dfl}/dfl-n3000-nios.c | 0
> drivers/fpga/{ => dfl}/dfl-pci.c | 0
> drivers/fpga/{ => dfl}/dfl.c | 0
> drivers/fpga/{ => dfl}/dfl.h | 0
> 23 files changed, 102 insertions(+), 97 deletions(-)
> create mode 100644 drivers/fpga/dfl/Kconfig
> create mode 100644 drivers/fpga/dfl/Makefile
> rename drivers/fpga/{ => dfl}/dfl-afu-dma-region.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-afu-error.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-afu-main.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-afu-region.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-afu.h (100%)
> rename drivers/fpga/{ => dfl}/dfl-fme-br.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-fme-error.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-fme-main.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-fme-mgr.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-fme-perf.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-fme-pr.c (100%)

You should update Documentation/fpga/dfl.rst too as it mentions
"drivers/fpga/dfl-fme-pr.c". This update was in your initial patch 5 so
it's lost now, but it really should be in this patch.

> rename drivers/fpga/{ => dfl}/dfl-fme-pr.h (100%)
> rename drivers/fpga/{ => dfl}/dfl-fme-region.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-fme.h (100%)
> rename drivers/fpga/{ => dfl}/dfl-n3000-nios.c (100%)
> rename drivers/fpga/{ => dfl}/dfl-pci.c (100%)
> rename drivers/fpga/{ => dfl}/dfl.c (100%)

Same as above.

--
Luca