diff options
Diffstat (limited to 'meta/recipes-bsp/opensbi/opensbi-payloads.inc')
| -rw-r--r-- | meta/recipes-bsp/opensbi/opensbi-payloads.inc | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/meta/recipes-bsp/opensbi/opensbi-payloads.inc index b9714a7acb..cc31ab3b1d 100644 --- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc @@ -8,32 +8,27 @@ def riscv_get_extra_oemake_image(d): return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload def riscv_get_extra_oemake_fdt(d): - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') + sbi_fdt = d.getVar('RISCV_SBI_FDT') deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') - if sbi_fdt_payload is None: + if sbi_fdt is None: return "" - return "FW_PAYLOAD_FDT_PATH=" + deploy_dir + "/" + sbi_fdt_payload + return "FW_FDT_PATH=" + deploy_dir + "/" + sbi_fdt def riscv_get_do_compile_depends(d): sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') + 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: - # If we want U-Boot and a FDT then we need to depend on U-Boot and - # the kernel - if sbi_fdt_payload is not None: - return "virtual/bootloader:do_deploy virtual/kernel:do_deploy" - else: - return "virtual/bootloader:do_deploy" - # If we want a custom FDT then we need to depend on the kernel - if sbi_fdt_payload is not None: - return "virtual/kernel:do_deploy" + return "virtual/bootloader:do_deploy" return "" |