Message ID | 20210616050341.510702-3-drew@beagleboard.org |
---|---|
State | Accepted |
Headers | show |
Series | beaglev: enable opensbi generic platform | expand |
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 --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