[U-Boot] [PATCH] sunxi: Fix arm64 fdtfile variable

[Jagan Teki]

On Fri, Apr 14, 2017 at 10:14 PM, Andreas Färber <afaerber at suse.de> wrote:
> Currently $fdtfile is constructed from CONFIG_DEFAULT_TREE, containing
> the filename. However on arm64 that file is located in an allwinner
> subdirectory.
>
> To avoid the need for users/distros symlinking the .dtb files, prepend
> the vendor directory for ARM64.
>
> This aligns Pine64 with other boards such as Raspberry Pi 3.
>
> Signed-off-by: Andreas Färber <afaerber at suse.de>
> ---
>  include/configs/sunxi-common.h | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index 1d475b1..ad4012c 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -476,11 +476,17 @@ extern int soft_i2c_gpio_scl;
>         CONSOLE_STDIN_SETTINGS \
>         CONSOLE_STDOUT_SETTINGS
>
> +#ifdef CONFIG_ARM64
> +#define FDTFILE "allwinner/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
> +#else
> +#define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
> +#endif
> +
>  #define CONFIG_EXTRA_ENV_SETTINGS \
>         CONSOLE_ENV_SETTINGS \
>         MEM_LAYOUT_ENV_SETTINGS \
>         DFU_ALT_INFO_RAM \
> -       "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
> +       "fdtfile=" FDTFILE "\0" \

__stringify(FDTFILE) ?

thanks!
-- 
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.