Files
build/patch/u-boot/v2025-sunxi/0005-board-sunxi-The-prefix-is-missing-if-we-use-OF_UPSTREAM.patch
The-going a73e79a73f u-boot: v2025-sunxi: switching to v2025.04
- Fix dram, mmc for h616.
- The prefix is missing if we use OF_UPSTREAM
- upstream: arm64: sun50i-h616: sync with sunxi-6.12 kernel
- upstream: arm64: Add sun50i-h618-bananapi-m4-berry.dts
2025-04-16 23:32:36 +02:00

29 lines
841 B
Diff

From a34b6a50de81cc5cb1a82ea2196a198fb6719cb3 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Tue, 1 Apr 2025 15:55:05 +0300
Subject: board: sunxi: The prefix is missing if we use OF_UPSTREAM
---
board/sunxi/board.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index c7a2205ed610..2797cf5e00da 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -826,7 +826,11 @@ 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) {
+#ifdef CONFIG_OF_UPSTREAM
+ char *prefix = "";
+#else
char *prefix = IS_ENABLED(CONFIG_ARM64) ? "allwinner/" : "";
+#endif
char str[64];
snprintf(str, sizeof(str), "%s%s.dtb", prefix, spl_dt_name);
--
2.35.3