diff options
| author | Bohdan Chubuk <[email protected]> | 2025-11-23 22:43:46 +0200 |
|---|---|---|
| committer | Andre Przywara <[email protected]> | 2026-01-25 23:29:32 +0000 |
| commit | eb7390797d262eaab589a4d4e71fbb0c156bd61c (patch) | |
| tree | 6bca66b3db6b21867d91a211b7489046db1b09cd | |
| parent | c47b636737366d9bc017b915ca6fcbcce8706e6e (diff) | |
sunxi: avoid double vendor prefix when CONFIG_OF_UPSTREAM is enabled
When CONFIG_OF_UPSTREAM is enabled, the device tree name provided by SPL
already includes the vendor directory (e.g., "allwinner/board-name").
The existing logic in misc_init_r() unconditionally prepends "allwinner/"
for ARM64 builds, resulting in an incorrect path like
"allwinner/allwinner/board-name.dtb".
This patch modifies the logic to only prepend the vendor prefix if
CONFIG_OF_UPSTREAM is NOT enabled. This ensures compatibility with both
legacy builds and the new upstream devicetree structure.
Signed-off-by: Bohdan Chubuk <[email protected]>
Reviewed-by: Andre Przywara <[email protected]>
| -rw-r--r-- | board/sunxi/board.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 2929bc17f08..e9e3fb9a571 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -834,9 +834,12 @@ int misc_init_r(void) /* Set fdtfile to match the FIT configuration chosen in SPL. */ spl_dt_name = get_spl_dt_name(); if (spl_dt_name) { - char *prefix = IS_ENABLED(CONFIG_ARM64) ? "allwinner/" : ""; + const char *prefix = ""; char str[64]; + if (IS_ENABLED(CONFIG_ARM64) && !IS_ENABLED(CONFIG_OF_UPSTREAM)) + prefix = "allwinner/"; + snprintf(str, sizeof(str), "%s%s.dtb", prefix, spl_dt_name); env_set("fdtfile", str); } |