diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2023-03-01 02:24:28 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-02 22:05:06 +0000 |
| commit | 83a986fcac535415108caf70a9fdee8edc59f7d5 (patch) | |
| tree | 5ec0bac94a356f9491a2c2d6e18d0ab7213433f1 /meta/recipes-bsp | |
| parent | 1cb64a5b6a950eb7f7c72125c5741fdafe236f0b (diff) | |
| download | openembedded-core-contrib-83a986fcac535415108caf70a9fdee8edc59f7d5.tar.gz | |
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-bsp')
| -rw-r--r-- | meta/recipes-bsp/opensbi/opensbi-payloads.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/meta/recipes-bsp/opensbi/opensbi-payloads.inc index e590a27573..a55679632e 100644 --- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc @@ -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" |