Merge tag 'fpga-fixes-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf...

FPGA Manager fixes for 5.8-rc1

Here is one (late) fix for 5.8-rc1 merge window.

Arnd's change addresses a missing build dependency.

All patches have been reviewed on the mailing list, and have been in the
last few linux-next releases (as part of my fixes branch) without issues.

Signed-off-by: Moritz Fischer <mdf@kernel.org>
* tag 'fpga-fixes-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
  fpga: zynqmp: fix modular build

diff --combined drivers/fpga/Kconfig
index b2408a7,37d2d49..7cd5a29
--- 1/drivers/fpga/Kconfig
--- 2/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@@ -156,7 -156,7 +156,7 @@@ config FPGA_DF
  
  config FPGA_DFL_FME
        tristate "FPGA DFL FME Driver"
 -      depends on FPGA_DFL && HWMON
 +      depends on FPGA_DFL && HWMON && PERF_EVENTS
        help
          The FPGA Management Engine (FME) is a feature device implemented
          under Device Feature List (DFL) framework. Select this option to
@@@ -208,7 -208,7 +208,7 @@@ config FPGA_DFL_PC
  
  config FPGA_MGR_ZYNQMP_FPGA
        tristate "Xilinx ZynqMP FPGA"
-       depends on ARCH_ZYNQMP || COMPILE_TEST
+       depends on ZYNQMP_FIRMWARE || (!ZYNQMP_FIRMWARE && COMPILE_TEST)
        help
          FPGA manager driver support for Xilinx ZynqMP FPGAs.
          This driver uses the processor configuration port(PCAP)