]> git.ipfire.org Git - thirdparty/u-boot.git/commit
sunxi: avoid double vendor prefix when CONFIG_OF_UPSTREAM is enabled
authorBohdan Chubuk <chbgdn@gmail.com>
Sun, 23 Nov 2025 20:43:46 +0000 (22:43 +0200)
committerAndre Przywara <andre.przywara@arm.com>
Sun, 25 Jan 2026 23:29:32 +0000 (23:29 +0000)
commiteb7390797d262eaab589a4d4e71fbb0c156bd61c
tree6bca66b3db6b21867d91a211b7489046db1b09cd
parentc47b636737366d9bc017b915ca6fcbcce8706e6e
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 <chbgdn@gmail.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
board/sunxi/board.c