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>
This commit is contained in:
Grant Likely 2010-07-05 12:02:13 -06:00
parent dd5e73794c
commit 5ab5fc7e35
3 changed files with 16 additions and 16 deletions

View File

@ -77,9 +77,6 @@ config LOCKDEP_SUPPORT
config HAVE_LATENCYTOP_SUPPORT config HAVE_LATENCYTOP_SUPPORT
def_bool y def_bool y
config DTC
def_bool y
source "init/Kconfig" source "init/Kconfig"
source "kernel/Kconfig.freezer" source "kernel/Kconfig.freezer"

View File

@ -196,10 +196,6 @@ config SYS_SUPPORTS_APM_EMULATION
default y if PMAC_APM_EMU default y if PMAC_APM_EMU
bool bool
config DTC
bool
default y
config DEFAULT_UIMAGE config DEFAULT_UIMAGE
bool bool
help help

View File

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