board: vexpress64: default to hardware device tree

When booting into the Linux kernel with semi-hosting, use the device
tree provided by hardware unless one is provided in the current
directory.

Signed-off-by: Harrison Mutai <harrison.mutai@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index b5a17f9..5eee13b 100644 (file)
--- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h
@@ -181,12 +181,14 @@
                "  if load hostfs - ${kernel_addr_r} ${kernel_name}; then"      \
                "    setenv fdt_high 0xffffffffffffffff;"               \
                "    setenv initrd_high 0xffffffffffffffff;"            \
-               "    load hostfs - ${fdt_addr_r} ${fdtfile};"                   \
+               "    if test -n load hostfs - ${fdt_addr_r} ${fdtfile}; then"                   \
+               "        fdt move $fdtcontroladdr $fdt_addr_r;"                 \
+               "    fi;"                       \
                "    load hostfs - ${ramdisk_addr_r} ${ramdisk_name};" \
                "    fdt addr ${fdt_addr_r};"                           \
                "    fdt resize;"                                       \
                "    fdt chosen ${ramdisk_addr_r} ${filesize};" \
-               "    booti $kernel_addr_r - $fdt_addr_r;"               \
+               "    booti $kernel_addr_r - ${fdt_addr_r};"             \
                "  fi;"                                                 \
                "fi\0"
 #define BOOTENV_DEV_NAME_SMH(devtypeu, devtypel, instance) "smh "