configs: meson64: remove amlogic prefix in fdtfile when CONFIG_OF_UPSTREAM is selected

Remove amlogic/ path prefix in CFG_EXTRA_ENV_SETTINGS fdtfile when
using CONFIG_OF_UPSTREAM, otherwise amlogic/ is added twice.

Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # khadas-vim3_android
Link: https://lore.kernel.org/r/20240329-u-boot-of-upstream-v2-1-2512ad3eb63d@linaro.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index efab9a624dc5f2aba05380ffa128913cf934500f..65fa5f3d6dd574f92f01baeb840b300e0bcd28ab 100644 (file)
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -120,6 +120,12 @@
 
 #include <config_distro_bootcmd.h>
 
+#ifdef CONFIG_OF_UPSTREAM
+#define FDTFILE_NAME           CONFIG_DEFAULT_DEVICE_TREE ".dtb"
+#else
+#define FDTFILE_NAME           "amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
+#endif
+
 #ifndef CFG_EXTRA_ENV_SETTINGS
 #define CFG_EXTRA_ENV_SETTINGS \
        "stdin=" STDIN_CFG "\0" \
@@ -133,7 +139,7 @@
        "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \
        "fdtoverlay_addr_r=" FDTOVERLAY_ADDR_R "\0" \
        "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \
-       "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+       "fdtfile=" FDTFILE_NAME "\0" \
        "dfu_alt_info=fitimage ram " KERNEL_ADDR_R " 0x4000000 \0" \
        BOOTENV
 #endif