of: Put all CONFIG_OF dependencies into a Kconfig menu block

All of the options in drivers/of/Kconfig depend on CONFIG_OF.  Putting
all of them inside a menu block simplifies the dependency statements.
It also creates a logical group for adding user selectable OF options.

This patch also changes (PPC_OF || MICROBLAZE) statements to (!SPARC)
so that those options are available to other architectures (and in
fact the !SPARC conditions should probably be re-evalutated since the
code is more generic now)

This patch also moves the definition of CONFIG_DTC from arch/* to
drivers/of/Kconfig

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 1a8f682248ce59a17d7b2ee2e690d827e8b1729f..971f86760d835acccfe243152e67ad8364364c57 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -77,9 +77,6 @@ config LOCKDEP_SUPPORT
 config HAVE_LATENCYTOP_SUPPORT
        def_bool y
 
-config DTC
-       def_bool y
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 402f4c028eb81c29254745b3ebb5dc874a873554..9b8e479c39da545fbf4aee2a0521997ce8fb5ec8 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -196,10 +196,6 @@ config SYS_SUPPORTS_APM_EMULATION
        default y if PMAC_APM_EMU
        bool
 
-config DTC
-       bool
-       default y
-
 config DEFAULT_UIMAGE
        bool
        help

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index d836b47d0be58a96a94783c63e3b71c0bc5463d6..ae2d4ad67bd039bab763f9ae9d07ce95420c24b8 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -1,46 +1,53 @@
+config DTC
+       bool
+
 config OF
        bool
 
+menu "Flattened Device Tree and Open Firmware support"
+       depends on OF
+
 config OF_FLATTREE
        bool
-       depends on OF
+       select DTC
 
 config OF_DYNAMIC
        def_bool y
-       depends on OF && PPC_OF
+       depends on PPC_OF
 
 config OF_ADDRESS
        def_bool y
-       depends on OF && !SPARC
+       depends on !SPARC
 
 config OF_IRQ
        def_bool y
-       depends on OF && !SPARC
+       depends on !SPARC
 
 config OF_DEVICE
        def_bool y
-       depends on OF && (SPARC || PPC_OF || MICROBLAZE)
 
 config OF_GPIO
        def_bool y
-       depends on OF && (PPC_OF || MICROBLAZE) && GPIOLIB
+       depends on GPIOLIB && !SPARC
        help
          OpenFirmware GPIO accessors
 
 config OF_I2C
        def_tristate I2C
-       depends on OF && !SPARC && I2C
+       depends on I2C && !SPARC
        help
          OpenFirmware I2C accessors
 
 config OF_SPI
        def_tristate SPI
-       depends on OF && (PPC_OF || MICROBLAZE) && SPI
+       depends on SPI && !SPARC
        help
          OpenFirmware SPI accessors
 
 config OF_MDIO
        def_tristate PHYLIB
-       depends on OF && PHYLIB
+       depends on PHYLIB
        help
          OpenFirmware MDIO bus (Ethernet PHY) accessors
+
+endmenu # OF