No need to get into the submenu to disable all FPGA-related config entries
Signed-off-by: Vincent Legoll <[email protected]>
---
drivers/fpga/Kconfig | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index ce861a2..fa1a95e 100644
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -2,32 +2,30 @@
# FPGA framework configuration
#
-menu "FPGA Configuration Support"
-
-config FPGA
+menuconfig FPGA
tristate "FPGA Configuration Framework"
help
Say Y here if you want support for configuring FPGAs from the
kernel. The FPGA framework adds a FPGA manager class and FPGA
manager drivers.
-if FPGA
-
config FPGA_REGION
tristate "FPGA Region"
- depends on OF && FPGA_BRIDGE
+ depends on FPGA && OF && FPGA_BRIDGE
help
FPGA Regions allow loading FPGA images under control of
the Device Tree.
config FPGA_MGR_SOCFPGA
tristate "Altera SOCFPGA FPGA Manager"
+ depends on FPGA
depends on ARCH_SOCFPGA || COMPILE_TEST
help
FPGA manager driver support for Altera SOCFPGA.
config FPGA_MGR_SOCFPGA_A10
tristate "Altera SoCFPGA Arria10"
+ depends on FPGA
depends on ARCH_SOCFPGA || COMPILE_TEST
select REGMAP_MMIO
help
@@ -35,6 +33,7 @@ config FPGA_MGR_SOCFPGA_A10
config FPGA_MGR_ZYNQ_FPGA
tristate "Xilinx Zynq FPGA"
+ depends on FPGA
depends on ARCH_ZYNQ || COMPILE_TEST
depends on HAS_DMA
help
@@ -42,27 +41,23 @@ config FPGA_MGR_ZYNQ_FPGA
config FPGA_BRIDGE
tristate "FPGA Bridge Framework"
- depends on OF
+ depends on FPGA && OF
help
Say Y here if you want to support bridges connected between host
processors and FPGAs or between FPGAs.
config SOCFPGA_FPGA_BRIDGE
tristate "Altera SoCFPGA FPGA Bridges"
- depends on ARCH_SOCFPGA && FPGA_BRIDGE
+ depends on FPGA && ARCH_SOCFPGA && FPGA_BRIDGE
help
Say Y to enable drivers for FPGA bridges for Altera SOCFPGA
devices.
config ALTERA_FREEZE_BRIDGE
tristate "Altera FPGA Freeze Bridge"
- depends on ARCH_SOCFPGA && FPGA_BRIDGE
+ depends on FPGA && ARCH_SOCFPGA && FPGA_BRIDGE
help
Say Y to enable drivers for Altera FPGA Freeze bridges. A
freeze bridge is a bridge that exists in the FPGA fabric to
isolate one region of the FPGA from the busses while that
region is being reprogrammed.
-
-endif # FPGA
-
-endmenu
--
2.9.3
On 04/14/17 02:06, Vincent Legoll wrote:
> No need to get into the submenu to disable all FPGA-related config entries
>
> Signed-off-by: Vincent Legoll <[email protected]>
> ---
> drivers/fpga/Kconfig | 21 ++++++++-------------
> 1 file changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
> index ce861a2..fa1a95e 100644
> --- a/drivers/fpga/Kconfig
> +++ b/drivers/fpga/Kconfig
> @@ -2,32 +2,30 @@
> # FPGA framework configuration
> #
>
> -menu "FPGA Configuration Support"
> -
> -config FPGA
> +menuconfig FPGA
> tristate "FPGA Configuration Framework"
> help
> Say Y here if you want support for configuring FPGAs from the
> kernel. The FPGA framework adds a FPGA manager class and FPGA
> manager drivers.
>
> -if FPGA
> -
why not leave the "if FPGA" end "endif # FPGA" lines
and not add "depends on FPGA" to each entry?
> config FPGA_REGION
> tristate "FPGA Region"
> - depends on OF && FPGA_BRIDGE
> + depends on FPGA && OF && FPGA_BRIDGE
> help
> FPGA Regions allow loading FPGA images under control of
> the Device Tree.
>
> config FPGA_MGR_SOCFPGA
> tristate "Altera SOCFPGA FPGA Manager"
> + depends on FPGA
> depends on ARCH_SOCFPGA || COMPILE_TEST
> help
> FPGA manager driver support for Altera SOCFPGA.
>
> config FPGA_MGR_SOCFPGA_A10
> tristate "Altera SoCFPGA Arria10"
> + depends on FPGA
> depends on ARCH_SOCFPGA || COMPILE_TEST
> select REGMAP_MMIO
> help
> @@ -35,6 +33,7 @@ config FPGA_MGR_SOCFPGA_A10
>
> config FPGA_MGR_ZYNQ_FPGA
> tristate "Xilinx Zynq FPGA"
> + depends on FPGA
> depends on ARCH_ZYNQ || COMPILE_TEST
> depends on HAS_DMA
> help
> @@ -42,27 +41,23 @@ config FPGA_MGR_ZYNQ_FPGA
>
> config FPGA_BRIDGE
> tristate "FPGA Bridge Framework"
> - depends on OF
> + depends on FPGA && OF
> help
> Say Y here if you want to support bridges connected between host
> processors and FPGAs or between FPGAs.
>
> config SOCFPGA_FPGA_BRIDGE
> tristate "Altera SoCFPGA FPGA Bridges"
> - depends on ARCH_SOCFPGA && FPGA_BRIDGE
> + depends on FPGA && ARCH_SOCFPGA && FPGA_BRIDGE
> help
> Say Y to enable drivers for FPGA bridges for Altera SOCFPGA
> devices.
>
> config ALTERA_FREEZE_BRIDGE
> tristate "Altera FPGA Freeze Bridge"
> - depends on ARCH_SOCFPGA && FPGA_BRIDGE
> + depends on FPGA && ARCH_SOCFPGA && FPGA_BRIDGE
> help
> Say Y to enable drivers for Altera FPGA Freeze bridges. A
> freeze bridge is a bridge that exists in the FPGA fabric to
> isolate one region of the FPGA from the busses while that
> region is being reprogrammed.
> -
> -endif # FPGA
> -
> -endmenu
>
--
~Randy
On 04/14/17 15:39, Vincent Legoll wrote:
> Hello Randy,
>
> you mean like the following ?
>
> Looks like this is working as intended and much simpler, thanks.
>
Yes, like that. Thanks.
--
~Randy
Hello Randy,
you mean like the following ?
Looks like this is working as intended and much simpler, thanks.
No need to get into the submenu to disable all FPGA-related config entries
Signed-off-by: Vincent Legoll <[email protected]>
---
drivers/fpga/Kconfig | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index ce861a2..2cb9b81 100644
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -2,9 +2,7 @@
# FPGA framework configuration
#
-menu "FPGA Configuration Support"
-
-config FPGA
+menuconfig FPGA
tristate "FPGA Configuration Framework"
help
Say Y here if you want support for configuring FPGAs from the
@@ -64,5 +62,3 @@ config ALTERA_FREEZE_BRIDGE
region is being reprogrammed.
endif # FPGA
-
-endmenu
--
2.9.3