diff mbox series

[v2,2/4] boot/opensbi: introduce BR2_TARGET_OPENSBI_FW_FDT_PATH

Message ID 20210616050341.510702-3-drew@beagleboard.org
State Accepted
Headers show
Series beaglev: enable opensbi generic platform | expand

Commit Message

Drew Fustini June 16, 2021, 5:03 a.m. UTC 
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>
---
 boot/opensbi/Config.in  | 10 ++++++++++
 boot/opensbi/opensbi.mk |  3 +++
 2 files changed, 13 insertions(+)

Comments

Thomas Petazzoni July 18, 2021, 8:15 p.m. UTC | #1 
Hello,

On Tue, 15 Jun 2021 22:03:41 -0700
Drew Fustini <drew@beagleboard.org> wrote:

> +config BR2_TARGET_OPENSBI_FW_FDT_PATH
> +	bool "Include U-Boot DTB in OpenSBI Payload"
> +	depends on BR2_TARGET_OPENSBI_PLAT != ""
> +	depends on BR2_TARGET_UBOOT

Both of these were not needed, as they are already part of
BR2_TARGET_OPENSBI_UBOOT_PAYLOAD, which you depend on.

> +	depends on BR2_TARGET_OPENSBI_UBOOT_PAYLOAD
> +	select BR2_TARGET_OPENSBI_INSTALL_PAYLOAD_IMG

This select was not needed, as it's already done by
BR2_TARGET_OPENSBI_UBOOT_PAYLOAD, which you depend on.

However, I've added a "select BR2_TARGET_UBOOT_FORMAT_DTB" to make sure
u-boot.dtb gets installed in BINARIES_DIR.

Applied with those changes.

Thanks!

Thomas
diff mbox series

Patch

diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in
index 632eeec88d77..bd4bd5ee6175 100644
--- a/boot/opensbi/Config.in
+++ b/boot/opensbi/Config.in
@@ -109,4 +109,14 @@  config BR2_TARGET_OPENSBI_UBOOT_PAYLOAD
 	help
 	  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_PLAT != ""
+	depends on BR2_TARGET_UBOOT
+	depends on BR2_TARGET_OPENSBI_UBOOT_PAYLOAD
+	select BR2_TARGET_OPENSBI_INSTALL_PAYLOAD_IMG
+	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 kconfig.
+
 endif
diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk
index a525b8aea348..8e055633a82d 100644
--- a/boot/opensbi/opensbi.mk
+++ b/boot/opensbi/opensbi.mk
@@ -46,6 +46,9 @@  endif
 ifeq ($(BR2_TARGET_OPENSBI_UBOOT_PAYLOAD),y)
 OPENSBI_DEPENDENCIES += uboot
 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
 
 define OPENSBI_BUILD_CMDS