Commit 834e7c8136c6 ("dts: meson-g12a: Switch to using upstream DT") changed Amlogic configs to contain the default /amlogic device-tree path prefix, e.g. for odroid-n2:

CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-g12b-odroid-n2"

The board files also prefix amlogic when using fdtdir resulting in an /amlogic/amlogic/meson-g12b-odroid-n2.dtb path which is invalid with most distro packaging. Drop the prefix here to align with the board configs. This resolves fdtdir boot on Odroid N2/C4/HC4.

Signed-off-by: Christian Hewitt christianshewitt@gmail.com --- board/amlogic/odroid-n2/odroid-n2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c index ae953d0e4ba..e98580631ec 100644 --- a/board/amlogic/odroid-n2/odroid-n2.c +++ b/board/amlogic/odroid-n2/odroid-n2.c @@ -62,7 +62,7 @@ static void odroid_set_fdtfile(char *soc, char *variant) { char s[128];

- snprintf(s, sizeof(s), "amlogic/meson-%s-odroid-%s.dtb", soc, variant); + snprintf(s, sizeof(s), "meson-%s-odroid-%s.dtb", soc, variant); env_set("fdtfile", s); }