[PATCH v2 2/4] board: vexpress64: default to hardware device tree

[Simon Glass]

Hi Harrison,

On Wed, 15 Jan 2025 at 06:52, Harrison Mutai <harrison.mutai at arm.com> wrote:
>
> 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 at arm.com>
> ---
>  include/configs/vexpress_aemv8.h | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>

Thinking about standard boot, could we add a bootdev for hostfs? Then
we could drop these scripts.

> diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
> index 8020689e39..2341b3a938 100644
> --- a/include/configs/vexpress_aemv8.h
> +++ b/include/configs/vexpress_aemv8.h
> @@ -169,12 +169,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 "
> --
> 2.46.2
>

Regards,
Simon