diff options
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index e4545f85ee9f..e2bf40a2ce5a 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -120,6 +120,8 @@ config ARCH_NO_VIRT_TO_BUS | |||
120 | config PPC | 120 | config PPC |
121 | bool | 121 | bool |
122 | default y | 122 | default y |
123 | select OF | ||
124 | select OF_FLATTREE | ||
123 | select HAVE_FTRACE_MCOUNT_RECORD | 125 | select HAVE_FTRACE_MCOUNT_RECORD |
124 | select HAVE_DYNAMIC_FTRACE | 126 | select HAVE_DYNAMIC_FTRACE |
125 | select HAVE_FUNCTION_TRACER | 127 | select HAVE_FUNCTION_TRACER |
@@ -173,10 +175,6 @@ config ARCH_MAY_HAVE_PC_FDC | |||
173 | config PPC_OF | 175 | config PPC_OF |
174 | def_bool y | 176 | def_bool y |
175 | 177 | ||
176 | config OF | ||
177 | def_bool y | ||
178 | select OF_FLATTREE | ||
179 | |||
180 | config PPC_UDBG_16550 | 178 | config PPC_UDBG_16550 |
181 | bool | 179 | bool |
182 | default n | 180 | default n |
@@ -199,10 +197,6 @@ config SYS_SUPPORTS_APM_EMULATION | |||
199 | default y if PMAC_APM_EMU | 197 | default y if PMAC_APM_EMU |
200 | bool | 198 | bool |
201 | 199 | ||
202 | config DTC | ||
203 | bool | ||
204 | default y | ||
205 | |||
206 | config DEFAULT_UIMAGE | 200 | config DEFAULT_UIMAGE |
207 | bool | 201 | bool |
208 | help | 202 | help |
@@ -579,14 +573,6 @@ config SCHED_SMT | |||
579 | when dealing with POWER5 cpus at a cost of slightly increased | 573 | when dealing with POWER5 cpus at a cost of slightly increased |
580 | overhead in some places. If unsure say N here. | 574 | overhead in some places. If unsure say N here. |
581 | 575 | ||
582 | config PROC_DEVICETREE | ||
583 | bool "Support for device tree in /proc" | ||
584 | depends on PROC_FS | ||
585 | help | ||
586 | This option adds a device-tree directory under /proc which contains | ||
587 | an image of the device tree that the kernel copies from Open | ||
588 | Firmware or other boot firmware. If unsure, say Y here. | ||
589 | |||
590 | config CMDLINE_BOOL | 576 | config CMDLINE_BOOL |
591 | bool "Default bootloader kernel arguments" | 577 | bool "Default bootloader kernel arguments" |
592 | 578 | ||