[u-boot scripts PATCH] Use $fdtfile as the DT filename, if it's set

[u-boot scripts PATCH] Use $fdtfile as the DT filename, if it's set

[Stephen Warren]

From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

This makes the generated boot.scr use the same mechanism to determine
the DT filename as U-Boot's pxe or sysboot commands, which parse an
extlinux.conf file.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 gen-uboot-script.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gen-uboot-script.py b/gen-uboot-script.py
index 7c55b2594e07..46847e50834a 100755
--- a/gen-uboot-script.py
+++ b/gen-uboot-script.py
@@ -119,7 +119,15 @@ if args.initrd:
 else:
     ramdisk = '-'
 
-f.write(load + ' ${fdt_addr_r} ${prefix}${soc}-${board}${boardver}.dtb\n')
+f.write('''\
+if test -n "${fdtfile}"; then
+    set _fdt ${fdtfile};
+else
+    set _fdt ${soc}-${board}${boardver}.dtb;
+fi
+''')
+f.write(load + ' ${fdt_addr_r} ' + prefix + '${_fdt}\n')
+f.write('set _fdt\n')
 
 bootargs = ''
 if not args.no_con_ttyS0:
-- 
1.8.1.5

Re: [u-boot scripts PATCH] Use $fdtfile as the DT filename, if it's set

[Stephen Warren]

On 01/27/2014 02:26 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> 
> This makes the generated boot.scr use the same mechanism to determine
> the DT filename as U-Boot's pxe or sysboot commands, which parse an
> extlinux.conf file.

Patch applied.