From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 3 Dec 2007 02:49:24 +0000 (+1100)
Subject: [POWERPC] Find device-tree source file in default directory
X-Git-Tag: v2.6.25-rc1~1131^2~355
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=701172d1b8a90d87532e49b946966ff37f948cc2;p=linux-2.6

[POWERPC] Find device-tree source file in default directory

If a .dts file is given to the bootwrapper script without a full path
name, look in a sensible place for it.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 221b8c87f5..b8e4856af7 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -116,6 +116,9 @@ while [ "$#" -gt 0 ]; do
 done
 
 if [ -n "$dts" ]; then
+    if [ ! -r "$dts" -a -r "$object/dts/$dts" ]; then
+	dts="$object/dts/$dts"
+    fi
     if [ -z "$dtb" ]; then
 	dtb="$platform.dtb"
     fi