Merge tag 'nfs-for-4.2-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-block.git] / drivers / of / Kconfig

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 7bcaeec876c0c3a5ea80a01d13b13b186bb2227f..8df1b1777745e8e0dfb46611197a8238c929af4e 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -1,15 +1,20 @@
 config DTC
        bool
 
-config OF
-       bool
+menuconfig OF
+       bool "Device Tree and Open Firmware support"
+       help
+         This option enables the device tree infrastructure.
+         It is automatically selected by platforms that need it or can
+         be enabled manually for unittests, overlays or
+         compile-coverage.
 
-menu "Device Tree and Open Firmware support"
-       depends on OF
+if OF
 
 config OF_UNITTEST
        bool "Device Tree runtime unit tests"
-       depends on OF_IRQ && OF_EARLY_FLATTREE
+       depends on OF_IRQ
+       select OF_EARLY_FLATTREE
        select OF_RESOLVE
        help
          This option builds in test cases for the device tree infrastructure
@@ -34,7 +39,11 @@ config OF_PROMTREE
 # Hardly any platforms need this.  It is safe to select, but only do so if you
 # need it.
 config OF_DYNAMIC
-       bool
+       bool "Support for dynamic device trees" if OF_UNITTEST
+       help
+         On some platforms, the device tree can be manipulated at runtime.
+         While this option is selected automatically on such platforms, you
+         can enable it manually to improve device tree unit test coverage.
 
 config OF_ADDRESS
        def_bool y
@@ -46,7 +55,7 @@ config OF_ADDRESS_PCI
 
 config OF_IRQ
        def_bool y
-       depends on !SPARC
+       depends on !SPARC && IRQ_DOMAIN
 
 config OF_NET
        depends on NETDEVICES
@@ -87,5 +96,10 @@ config OF_OVERLAY
        bool "Device Tree overlays"
        select OF_DYNAMIC
        select OF_RESOLVE
+       help
+         Overlays are a method to dynamically modify part of the kernel's
+         device tree with dynamically loaded data.
+         While this option is selected automatically when needed, you can
+         enable it manually to improve device tree unit test coverage.
 
-endmenu # OF
+endif # OF