浏览代码

boot/opensbi: introduce BR2_TARGET_OPENSBI_FW_FDT_PATH

If U-Boot CONFIG_OF_SEPARATE is defined [1], then the device tree will
be built and placed in a u-boot.dtb file alongside u-boot.bin.

When BR2_TARGET_UBOOT_FORMAT_DTB is enabled, buildroot will copy
u-boot.dtb to $(BINARIES_DIR).

This is useful for RISC-V platforms that want to build OpenSBI with an
external DTB by using FW_FDT_PATH [2].

[1] https://github.com/u-boot/u-boot/blob/master/doc/README.fdt-control
[2] https://github.com/riscv/opensbi/blob/master/docs/firmware/fw.md

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Drew Fustini <drew@beagleboard.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Drew Fustini 4 年之前
父节点
当前提交
4210b26892
共有 2 个文件被更改,包括 13 次插入0 次删除
  1. 10 0
      boot/opensbi/Config.in
  2. 3 0
      boot/opensbi/opensbi.mk

+ 10 - 0
boot/opensbi/Config.in

@@ -109,4 +109,14 @@ config BR2_TARGET_OPENSBI_UBOOT_PAYLOAD
 	help
 	help
 	  Build OpenSBI with the U-Boot as a Payload.
 	  Build OpenSBI with the U-Boot as a Payload.
 
 
+config BR2_TARGET_OPENSBI_FW_FDT_PATH
+	bool "Include U-Boot DTB in OpenSBI Payload"
+	depends on BR2_TARGET_OPENSBI_UBOOT_PAYLOAD
+	select BR2_TARGET_UBOOT_FORMAT_DTB
+	help
+	  Build OpenSBI with FW_FDT_PATH set to
+	  $(BINARIES_DIR)/u-boot.dtb. Note that CONFIG_OF_SEPARATE
+	  must be set in the U-Boot configuration for this file to be
+	  produced.
+
 endif
 endif

+ 3 - 0
boot/opensbi/opensbi.mk

@@ -46,6 +46,9 @@ endif
 ifeq ($(BR2_TARGET_OPENSBI_UBOOT_PAYLOAD),y)
 ifeq ($(BR2_TARGET_OPENSBI_UBOOT_PAYLOAD),y)
 OPENSBI_DEPENDENCIES += uboot
 OPENSBI_DEPENDENCIES += uboot
 OPENSBI_MAKE_ENV += FW_PAYLOAD_PATH="$(BINARIES_DIR)/u-boot.bin"
 OPENSBI_MAKE_ENV += FW_PAYLOAD_PATH="$(BINARIES_DIR)/u-boot.bin"
+ifeq ($(BR2_TARGET_OPENSBI_FW_FDT_PATH),y)
+OPENSBI_MAKE_ENV += FW_FDT_PATH="$(BINARIES_DIR)/u-boot.dtb"
+endif
 endif
 endif
 
 
 define OPENSBI_BUILD_CMDS
 define OPENSBI_BUILD_CMDS