summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-07-05 12:02:13 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-07-05 16:14:55 -0600
commit5ab5fc7e35705cf1a8a506d8e8b71acc27feec75 (patch)
treea0557f867fe39ec91f440fc34f7d50528c7353d3
parentdd5e73794c9af30d6491963e13436d9f05ee6df6 (diff)
downloadop-kernel-dev-5ab5fc7e35705cf1a8a506d8e8b71acc27feec75.zip
op-kernel-dev-5ab5fc7e35705cf1a8a506d8e8b71acc27feec75.tar.gz
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>
-rw-r--r--arch/microblaze/Kconfig3
-rw-r--r--arch/powerpc/Kconfig4
-rw-r--r--drivers/of/Kconfig25
3 files changed, 16 insertions, 16 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 1a8f682..971f867 100644
--- 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 402f4c0..9b8e479 100644
--- 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 d836b47..ae2d4ad 100644
--- 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
OpenPOWER on IntegriCloud