Am 18.04.2017 um 07:45 schrieb Jagan Teki: > On Fri, Apr 14, 2017 at 10:14 PM, Andreas Färber <afaer...@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 <afaer...@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) ?
Why? You didn't do that before, and it worked fine for me on Pine64 and Orange Pi PC 2. Do you have a test case that breaks? Thanks, Andreas -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
