Skip to content

Commit

Permalink
of: Put all CONFIG_OF dependencies into a Kconfig menu block
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Grant Likely committed Jul 5, 2010
1 parent dd5e737 commit 5ab5fc7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
3 changes: 0 additions & 3 deletions arch/microblaze/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 16 additions & 9 deletions drivers/of/Kconfig
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 5ab5fc7

Please sign in to comment.