diff options
-rw-r--r-- | arch/microblaze/Kconfig | 3 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 4 | ||||
-rw-r--r-- | drivers/of/Kconfig | 25 |
3 files changed, 16 insertions, 16 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 1a8f682248ce..971f86760d83 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
@@ -77,9 +77,6 @@ config LOCKDEP_SUPPORT | |||
77 | config HAVE_LATENCYTOP_SUPPORT | 77 | config HAVE_LATENCYTOP_SUPPORT |
78 | def_bool y | 78 | def_bool y |
79 | 79 | ||
80 | config DTC | ||
81 | def_bool y | ||
82 | |||
83 | source "init/Kconfig" | 80 | source "init/Kconfig" |
84 | 81 | ||
85 | source "kernel/Kconfig.freezer" | 82 | source "kernel/Kconfig.freezer" |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 402f4c028eb8..9b8e479c39da 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -196,10 +196,6 @@ config SYS_SUPPORTS_APM_EMULATION | |||
196 | default y if PMAC_APM_EMU | 196 | default y if PMAC_APM_EMU |
197 | bool | 197 | bool |
198 | 198 | ||
199 | config DTC | ||
200 | bool | ||
201 | default y | ||
202 | |||
203 | config DEFAULT_UIMAGE | 199 | config DEFAULT_UIMAGE |
204 | bool | 200 | bool |
205 | help | 201 | help |
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index d836b47d0be5..ae2d4ad67bd0 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig | |||
@@ -1,46 +1,53 @@ | |||
1 | config DTC | ||
2 | bool | ||
3 | |||
1 | config OF | 4 | config OF |
2 | bool | 5 | bool |
3 | 6 | ||
7 | menu "Flattened Device Tree and Open Firmware support" | ||
8 | depends on OF | ||
9 | |||
4 | config OF_FLATTREE | 10 | config OF_FLATTREE |
5 | bool | 11 | bool |
6 | depends on OF | 12 | select DTC |
7 | 13 | ||
8 | config OF_DYNAMIC | 14 | config OF_DYNAMIC |
9 | def_bool y | 15 | def_bool y |
10 | depends on OF && PPC_OF | 16 | depends on PPC_OF |
11 | 17 | ||
12 | config OF_ADDRESS | 18 | config OF_ADDRESS |
13 | def_bool y | 19 | def_bool y |
14 | depends on OF && !SPARC | 20 | depends on !SPARC |
15 | 21 | ||
16 | config OF_IRQ | 22 | config OF_IRQ |
17 | def_bool y | 23 | def_bool y |
18 | depends on OF && !SPARC | 24 | depends on !SPARC |
19 | 25 | ||
20 | config OF_DEVICE | 26 | config OF_DEVICE |
21 | def_bool y | 27 | def_bool y |
22 | depends on OF && (SPARC || PPC_OF || MICROBLAZE) | ||
23 | 28 | ||
24 | config OF_GPIO | 29 | config OF_GPIO |
25 | def_bool y | 30 | def_bool y |
26 | depends on OF && (PPC_OF || MICROBLAZE) && GPIOLIB | 31 | depends on GPIOLIB && !SPARC |
27 | help | 32 | help |
28 | OpenFirmware GPIO accessors | 33 | OpenFirmware GPIO accessors |
29 | 34 | ||
30 | config OF_I2C | 35 | config OF_I2C |
31 | def_tristate I2C | 36 | def_tristate I2C |
32 | depends on OF && !SPARC && I2C | 37 | depends on I2C && !SPARC |
33 | help | 38 | help |
34 | OpenFirmware I2C accessors | 39 | OpenFirmware I2C accessors |
35 | 40 | ||
36 | config OF_SPI | 41 | config OF_SPI |
37 | def_tristate SPI | 42 | def_tristate SPI |
38 | depends on OF && (PPC_OF || MICROBLAZE) && SPI | 43 | depends on SPI && !SPARC |
39 | help | 44 | help |
40 | OpenFirmware SPI accessors | 45 | OpenFirmware SPI accessors |
41 | 46 | ||
42 | config OF_MDIO | 47 | config OF_MDIO |
43 | def_tristate PHYLIB | 48 | def_tristate PHYLIB |
44 | depends on OF && PHYLIB | 49 | depends on PHYLIB |
45 | help | 50 | help |
46 | OpenFirmware MDIO bus (Ethernet PHY) accessors | 51 | OpenFirmware MDIO bus (Ethernet PHY) accessors |
52 | |||
53 | endmenu # OF | ||