]> err.no Git - linux-2.6/commit
[POWERPC] When appropriate, wrap device tree with zImage
authorMark A. Greer <mgreer@mvista.com>
Thu, 31 May 2007 19:55:35 +0000 (05:55 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 25 Jun 2007 07:00:09 +0000 (17:00 +1000)
commita00cec48ccda0f2b550ad4082d6e95c7cc232925
tree6f176b17f61cc8b45d57d23609cf422103e43c14
parent941b7adf347dc3e6e2bf87b2af1ef8a42b617a63
[POWERPC] When appropriate, wrap device tree with zImage

There are 2 config options that indicate whether the platform being built
has a device tree source file associated with it.  Namely,
CONFIG_WANT_DEVICE_TREE and CONFIG_DEVICE_TREE.  When CONFIG_WANT_DEVICE_TREE
is 'y' and CONFIG_DEVICE_TREE isn't an empty string, automatically wrap
the specified device tree with the zImage being built.

To achieve this, the 'dts' variable will only be set when the conditions
above are true.  The changes to the zImage.initrd.% and zImage.% rules
cause the device tree to be wrapped when 'dts' is set; otherwise, they
will work as they previosly did (i.e., build a zImage with no device tree).

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/boot/Makefile