mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

opensbi: Do not add dependencies if RISCV_SBI_FDT is not set

Browse Source 
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

(From OE-Core rev: 83a986fcac535415108caf70a9fdee8edc59f7d5)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2023-03-01 02:24:28 -08:00
committed by Richard Purdie
parent b5556c9fc6
commit bc74029deb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meta/recipes-bsp/opensbi/opensbi-payloads.inc
View File

@@ -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"