|
@@ -1,13 +1,15 @@
|
|
def riscv_get_extra_oemake_image(d):
|
|
def riscv_get_extra_oemake_image(d):
|
|
sbi_payload = d.getVar('RISCV_SBI_PAYLOAD')
|
|
sbi_payload = d.getVar('RISCV_SBI_PAYLOAD')
|
|
- deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
|
|
|
|
-
|
|
|
|
if sbi_payload is None:
|
|
if sbi_payload is None:
|
|
return ""
|
|
return ""
|
|
|
|
|
|
|
|
+ deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
|
|
|
|
+
|
|
return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload
|
|
return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload
|
|
|
|
|
|
def riscv_get_extra_oemake_fdt(d):
|
|
def riscv_get_extra_oemake_fdt(d):
|
|
|
|
+ if d.getVar('RISCV_SBI_PAYLOAD') is None:
|
|
|
|
+ return ""
|
|
sbi_fdt = d.getVar('RISCV_SBI_FDT')
|
|
sbi_fdt = d.getVar('RISCV_SBI_FDT')
|
|
deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
|
|
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):
|
|
def riscv_get_do_compile_depends(d):
|
|
sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') or ""
|
|
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 ""
|
|
return ""
|
|
|
|
|
|
|
|
+ sbi_fdt = d.getVar('RISCV_SBI_FDT') or ""
|
|
|
|
+
|
|
if sbi_fdt != "" and 'u-boot.bin' in sbi_payload:
|
|
if sbi_fdt != "" and 'u-boot.bin' in sbi_payload:
|
|
return "virtual/kernel:do_deploy virtual/bootloader:do_deploy"
|
|
return "virtual/kernel:do_deploy virtual/bootloader:do_deploy"
|
|
|
|
|