| Message ID | 20210615001750.421889-3-drew@beagleboard.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | beaglev: enable opensbi generic platform | expand |
Hi Drew, On Tue, Jun 15, 2021 at 8:18 AM Drew Fustini <drew@beagleboard.org> wrote: > > If u-boot CONFIG_OF_SEPARATE is defined [1], then the device tree will nits: U-Boot > 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/lentinj/u-boot/blob/master/doc/README.fdt-control Please use the official U-Boot github URL: https://github.com/u-boot/u-boot > [2] https://github.com/riscv/opensbi/blob/master/docs/firmware/fw.md > > Signed-off-by: Drew Fustini <drew@beagleboard.org> > --- > boot/opensbi/Config.in | 10 ++++++++++ > boot/opensbi/opensbi.mk | 3 +++ > 2 files changed, 13 insertions(+) > Otherwise, Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Regards, Bin
On Tue, Jun 15, 2021 at 10:18 AM Drew Fustini <drew@beagleboard.org> wrote: > > 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/lentinj/u-boot/blob/master/doc/README.fdt-control > [2] https://github.com/riscv/opensbi/blob/master/docs/firmware/fw.md > > Signed-off-by: Drew Fustini <drew@beagleboard.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > boot/opensbi/Config.in | 10 ++++++++++ > boot/opensbi/opensbi.mk | 3 +++ > 2 files changed, 13 insertions(+) > > 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 > -- > 2.27.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
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
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/lentinj/u-boot/blob/master/doc/README.fdt-control [2] https://github.com/riscv/opensbi/blob/master/docs/firmware/fw.md Signed-off-by: Drew Fustini <drew@beagleboard.org> --- boot/opensbi/Config.in | 10 ++++++++++ boot/opensbi/opensbi.mk | 3 +++ 2 files changed, 13 insertions(+)