Skip to contentSkip to conversation

riscv: sifive: Set default fdtfile names

PATCH New Dimitri John Ledkov 1 participant 1 message Jun 16, 2021 SiFive drivers

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 riscv: sifive: Set default fdtfile names

Set default fdtfile names for unleashed and unmatched boards, as used in the upstream Linux kernel. This allows sysboot command to find and load appropriate dtb for the matching kernel from universal stock Ubuntu RISC-V rootfs images based on fdtdir setting in extlinux.conf.

cc Paul Walmsley <[email protected]>
cc Palmer Dabbelt <[email protected]>
cc Anup Patel <[email protected]>
cc Atish Patra <[email protected]>
cc Pragnesh Patel <[email protected]>
cc Green Wan <[email protected]>

---
Changes since v1:

In commit message, removed trailing '.' and added hyphen in RISC-V. Added two reviewed-bys.

 configs/sifive_unleashed_defconfig | 1 +
 configs/sifive_unmatched_defconfig | 1 +
 include/configs/sifive-unleashed.h | 1 +
 include/configs/sifive-unmatched.h | 1 +
 4 files changed, 4 insertions(+)
configs/sifive_unleashed_defconfig +1 -0
index 62416a7c1d..7ef0e4b241 100644
@@ -14,6 +14,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
+CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unleashed-a00.dtb"
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_MISC_INIT_R=y
configs/sifive_unmatched_defconfig +1 -0
index 01ca2d8c23..66e9a23ee4 100644
@@ -14,6 +14,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
+CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unmatched-a00.dtb"
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
include/configs/sifive-unleashed.h +1 -0
index 0d69d1c548..b6c29f8c60 100644
@@ -75,6 +75,7 @@
 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
 	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
 	"partitions=" PARTS_DEFAULT "\0" \
+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	BOOTENV \
 	BOOTENV_SF
 
include/configs/sifive-unmatched.h +1 -0
index 4fad69bb19..80cfd41ceb 100644
@@ -73,6 +73,7 @@
 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
 	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
 	"partitions=" PARTS_DEFAULT "\0" \
+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	BOOTENV
 
 #define CONFIG_PREBOOT \
Signature · 1 line
2.27.0