diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc')
-rw-r--r-- | poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc index b9714a7acb..2e32943245 100644 --- a/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc @@ -7,18 +7,8 @@ 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') - deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') - - if sbi_fdt_payload is None: - return "" - - return "FW_PAYLOAD_FDT_PATH=" + deploy_dir + "/" + sbi_fdt_payload - def riscv_get_do_compile_depends(d): sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') if sbi_payload is None: return "" @@ -26,14 +16,6 @@ def riscv_get_do_compile_depends(d): 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 "" |