Skip to contentSkip to conversation

opensbi: Do not add dependencies if RISCV_SBI_FDT is not set

PATCH New Khem Raj 1 participant 1 message Mar 1, 2023

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 opensbi: Do not add dependencies if RISCV_SBI_FDT is not set

Dependencies only make sense when opensbi is being used to deliver payload which maybe an artifact of kernel or u-boot, otherwise it should be not added. This avoids circular dependencies when RISCV machines do not define RISCV_SBI_PAYLOAD but do define RISCV_SBI_FDT

---
 meta/recipes-bsp/opensbi/opensbi-payloads.inc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
meta/recipes-bsp/opensbi/opensbi-payloads.inc +7 -5
index e590a27573..a55679632e 100644
@@ -1,13 +1,15 @@
 def riscv_get_extra_oemake_image(d):
     sbi_payload = d.getVar('RISCV_SBI_PAYLOAD')
-    deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
-
     if sbi_payload is None:
         return ""
 
+    deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
+
     return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload
 
 def riscv_get_extra_oemake_fdt(d):
+    if d.getVar('RISCV_SBI_PAYLOAD') is None:
+        return ""
     sbi_fdt = d.getVar('RISCV_SBI_FDT')
     deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
 
@@ -18,11 +20,11 @@ def riscv_get_extra_oemake_fdt(d):
 
 def riscv_get_do_compile_depends(d):
     sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') or ""
-    sbi_fdt = d.getVar('RISCV_SBI_FDT') or ""
-
-    if sbi_payload == "" and sbi_fdt == "":
+    if sbi_payload == "":
         return ""
 
+    sbi_fdt = d.getVar('RISCV_SBI_FDT') or ""
+
     if sbi_fdt != "" and 'u-boot.bin' in sbi_payload:
         return "virtual/kernel:do_deploy virtual/bootloader:do_deploy"
 
Signature · 1 line
2.39.2