Merge branch 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

[powerpc.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 659b41f..a54a9a2 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -162,12 +162,14 @@ config PPC_83xx
        select FSL_SOC
        select 83xx
        select PPC_FPU
+       select WANT_DEVICE_TREE
 
 config PPC_85xx
        bool "Freescale 85xx"
        select E500
        select FSL_SOC
        select 85xx
+       select WANT_DEVICE_TREE
 
 config PPC_86xx
        bool "Freescale 86xx"
@@ -192,7 +194,6 @@ config 44x
        bool "AMCC 44x"
        select PPC_DCR_NATIVE
 
-
 config E200
        bool "Freescale e200"
 
@@ -375,11 +376,6 @@ source "init/Kconfig"
 
 source "arch/powerpc/platforms/Kconfig"
 
-source arch/powerpc/platforms/embedded6xx/Kconfig
-source arch/powerpc/platforms/4xx/Kconfig
-source arch/powerpc/platforms/85xx/Kconfig
-source arch/powerpc/platforms/8xx/Kconfig
-
 menu "Kernel options"
 
 config HIGHMEM
@@ -461,15 +457,6 @@ config CRASH_DUMP
 
          Don't change this unless you know what you are doing.
 
-config EMBEDDEDBOOT
-       bool
-       depends on 8xx || 8260
-       default y
-
-config PC_KEYBOARD
-       bool "PC PS/2 style Keyboard"
-       depends on 4xx || CPM2
-
 config PPCBUG_NVRAM
        bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
        default y if PPC_PREP
@@ -483,7 +470,6 @@ config IRQ_ALL_CPUS
          CPU.  Generally saying Y is safe, although some problems have been
          reported with SMP Power Macintoshes with this option enabled.
 
-
 config NUMA
        bool "NUMA support"
        depends on PPC64
@@ -533,10 +519,10 @@ config PPC_64K_PAGES
        depends on PPC64
        help
          This option changes the kernel logical page size to 64k. On machines
-          without processor support for 64k pages, the kernel will simulate
-          them by loading each individual 4k page on demand transparently,
-          while on hardware with such support, it will be used to map
-          normal application pages.
+         without processor support for 64k pages, the kernel will simulate
+         them by loading each individual 4k page on demand transparently,
+         while on hardware with such support, it will be used to map
+         normal application pages.
 
 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
@@ -588,6 +574,29 @@ config SECCOMP
 
          If unsure, say Y. Only embedded should say N here.
 
+config WANT_DEVICE_TREE
+       bool
+       default n
+
+config DEVICE_TREE
+       string "Static device tree source file"
+       depends on WANT_DEVICE_TREE
+       help
+         This specifies the device tree source (.dts) file to be
+         compiled and included when building the bootwrapper.  If a
+         relative filename is given, then it will be relative to
+         arch/powerpc/boot/dts.  If you are not using the bootwrapper,
+         or do not need to build a dts into the bootwrapper, this
+         field is ignored.
+
+         For example, this is required when building a cuImage target
+         for an older U-Boot, which cannot pass a device tree itself.
+         Such a kernel will not work with a newer U-Boot that tries to
+         pass a device tree (unless you tell it not to).  If your U-Boot
+         does not mention a device tree in "help bootm", then use the
+         cuImage target and specify a device tree here.  Otherwise, use
+         the uImage target and leave this field blank.
+
 endmenu
 
 config ISA_DMA_API
@@ -616,18 +625,6 @@ config GENERIC_ISA_DMA
        depends on PPC64 || POWER4 || 6xx && !CPM2
        default y
 
-config MPIC
-       bool
-       default n
-
-config MPIC_WEIRD
-       bool
-       default n
-
-config PPC_I8259
-       bool
-       default n
-
 config PPC_INDIRECT_PCI
        bool
        depends on PCI
@@ -859,11 +856,10 @@ source "fs/Kconfig"
 
 source "arch/powerpc/sysdev/qe_lib/Kconfig"
 
-
 source "lib/Kconfig"
 
 menu "Instrumentation Support"
-        depends on EXPERIMENTAL
+       depends on EXPERIMENTAL
 
 source "arch/powerpc/oprofile/Kconfig"