diff options
| author | Andreas Färber <afaerber@suse.de> | 2017-04-14 16:44:47 (GMT) |
|---|---|---|
| committer | Jagan Teki <jagan@openedev.com> | 2017-04-24 06:25:42 (GMT) |
| commit | 2eff3b7179a95a5cde0eaf8fae8c4b18956f2f59 (patch) | |
| tree | e07c80dab392f1bc9276f82354b524d5be9e2830 /include/configs/sunxi-common.h | |
| parent | f02abb0608fe7e47fa1ee62e0f7655d7e0e53a12 (diff) | |
| download | u-boot-2eff3b7179a95a5cde0eaf8fae8c4b18956f2f59.tar.xz | |
sunxi: Fix arm64 fdtfile variable
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@suse.de>
Reviewed-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Diffstat (limited to 'include/configs/sunxi-common.h')
| -rw-r--r-- | include/configs/sunxi-common.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 00653d8..64a1900 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -497,11 +497,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" \ "console=ttyS0,115200\0" \ SUNXI_MTDIDS_DEFAULT \ SUNXI_MTDPARTS_DEFAULT \ |