[POWERPC] bootwrapper: Add CONFIG_DEVICE_TREE

This provides a way to tell the bootwrapper makefile which device tree to
include by default.  The wrapper can still be invoked standalone to wrap
with a different device tree without reconfiguring the kernel, if that is
desired.

The user will only be asked to provide a device tree if the platform
selects CONFIG_WANT_DEVICE_TREE.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 24 insertions, 0 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 26713da1b524..9b9c00ee688d 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -162,6 +162,7 @@ config PPC_83xx
         select FSL_SOC
         select 83xx
         select PPC_FPU
+        select WANT_DEVICE_TREE
 
 config PPC_85xx
         bool "Freescale 85xx"
@@ -572,6 +573,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