Skip to contentSkip to conversation

recipes-bsp/u-boot: Allow deploying the u-boot DTB

PATCH New Khem Raj 1 participant 2 messages Jun 6, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/2 recipes-bsp/u-boot: Allow deploying the u-boot DTB

From: Alistair Francis <[email protected]>

Use ??= assignment for UBOOT_DTB_BINARY because it is set using ?= in fitImage bbclass as well, using ?= will preempt that

---
v2: Fix test regression

 meta/classes/uboot-config.bbclass  | 4 ++++
 meta/recipes-bsp/u-boot/u-boot.inc | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
meta/classes/uboot-config.bbclass +4 -0
index 3bba02828b..451db0c650 100644
@@ -71,6 +71,10 @@ UBOOT_MKIMAGE_SIGN ?= "${UBOOT_MKIMAGE}"
 UBOOT_MKIMAGE_SIGN_ARGS ?= ""
 SPL_MKIMAGE_SIGN_ARGS ?= ""
 
+# Options to deploy the u-boot device tree
+UBOOT_DTB ?= ""
+UBOOT_DTB_BINARY ??= ""
+
 python () {
     ubootmachine = d.getVar("UBOOT_MACHINE")
     ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
meta/recipes-bsp/u-boot/u-boot.inc +6 -1
index 5398c2e621..8ccc532f7e 100644
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS += "kern-tools-native"
 
-inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native
+inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch
 
 DEPENDS += "swig-native"
 
@@ -346,6 +346,11 @@ do_deploy () {
         ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}
         ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}
     fi
+
+    if [ -n "${UBOOT_DTB}" ]
+    then
+        install -m 644 ${B}/arch/${UBOOT_ARCH}/dts/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/
+    fi
 }
 
 addtask deploy before do_build after do_compile
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH v2 2/2 recipes-bsp/opensbi: Add support for specifying a device tree

From: Alistair Francis <[email protected]>

---
v2: Rebased

 meta/recipes-bsp/opensbi/opensbi-payloads.inc | 15 ++++++++++++++-
 meta/recipes-bsp/opensbi/opensbi_0.9.bb       |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)
meta/recipes-bsp/opensbi/opensbi-payloads.inc +14 -1
index 2e32943245..cc31ab3b1d 100644
@@ -7,12 +7,25 @@ def riscv_get_extra_oemake_image(d):
 
     return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload
 
+def riscv_get_extra_oemake_fdt(d):
+    sbi_fdt = d.getVar('RISCV_SBI_FDT')
+    deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
+
+    if sbi_fdt is None:
+        return ""
+
+    return "FW_FDT_PATH=" + deploy_dir + "/" + sbi_fdt
+
 def riscv_get_do_compile_depends(d):
     sbi_payload = d.getVar('RISCV_SBI_PAYLOAD')
+    sbi_fdt = d.getVar('RISCV_SBI_FDT')
 
-    if sbi_payload is None:
+    if sbi_payload is None and sbi_fdt is None:
         return ""
 
+    if sbi_fdt is not None and 'u-boot.bin' in sbi_payload:
+        return "virtual/kernel:do_deploy virtual/bootloader:do_deploy"
+
     if 'linux' in sbi_payload or 'Image' in sbi_payload:
         return "virtual/kernel:do_deploy"
     if 'u-boot.bin' in sbi_payload:
meta/recipes-bsp/opensbi/opensbi_0.9.bb +1 -0
index 52965abda5..5fee52136d 100644
@@ -18,6 +18,7 @@ S = "${WORKDIR}/git"
 EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n"
 # If RISCV_SBI_PAYLOAD is set then include it as a payload
 EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}"
+EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_fdt(d)}"
 
 # Required if specifying a custom payload
 do_compile[depends] += "${@riscv_get_do_compile_depends(d)}"

--
2.31.1