diff options
author | Alistair Francis <alistair.francis@wdc.com> | 2020-01-30 15:04:23 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-02 16:57:21 +0000 |
commit | 2b9781da7c6d60f8d0ddb36de2666b1ba702f551 (patch) | |
tree | 5e81cef3d85d2e3b521a5304e7e703cf70f54955 /meta/recipes-bsp/opensbi/opensbi-payloads.inc | |
parent | 86511f94c992eca945607b864e935c34fcc146ab (diff) | |
download | poky-2b9781da7c6d60f8d0ddb36de2666b1ba702f551.tar.gz |
opensbi: Remove dependency on FDT
U-Boot no longer requires OpenSBI to include a FDT for the HiFive
Unleashed, so remove the support from OpenSBI.
(From OE-Core rev: 472507b8c446dcfe3cb08deecfbca4e5928ca504)
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/opensbi/opensbi-payloads.inc')
-rw-r--r-- | meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/meta/recipes-bsp/opensbi/opensbi-payloads.inc index b9714a7acb..2e32943245 100644 --- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc | |||
@@ -7,18 +7,8 @@ def riscv_get_extra_oemake_image(d): | |||
7 | 7 | ||
8 | return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload | 8 | return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload |
9 | 9 | ||
10 | def riscv_get_extra_oemake_fdt(d): | ||
11 | sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') | ||
12 | deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') | ||
13 | |||
14 | if sbi_fdt_payload is None: | ||
15 | return "" | ||
16 | |||
17 | return "FW_PAYLOAD_FDT_PATH=" + deploy_dir + "/" + sbi_fdt_payload | ||
18 | |||
19 | def riscv_get_do_compile_depends(d): | 10 | def riscv_get_do_compile_depends(d): |
20 | sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') | 11 | sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') |
21 | sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') | ||
22 | 12 | ||
23 | if sbi_payload is None: | 13 | if sbi_payload is None: |
24 | return "" | 14 | return "" |
@@ -26,14 +16,6 @@ def riscv_get_do_compile_depends(d): | |||
26 | if 'linux' in sbi_payload or 'Image' in sbi_payload: | 16 | if 'linux' in sbi_payload or 'Image' in sbi_payload: |
27 | return "virtual/kernel:do_deploy" | 17 | return "virtual/kernel:do_deploy" |
28 | if 'u-boot.bin' in sbi_payload: | 18 | if 'u-boot.bin' in sbi_payload: |
29 | # If we want U-Boot and a FDT then we need to depend on U-Boot and | 19 | return "virtual/bootloader:do_deploy" |
30 | # the kernel | ||
31 | if sbi_fdt_payload is not None: | ||
32 | return "virtual/bootloader:do_deploy virtual/kernel:do_deploy" | ||
33 | else: | ||
34 | return "virtual/bootloader:do_deploy" | ||
35 | # If we want a custom FDT then we need to depend on the kernel | ||
36 | if sbi_fdt_payload is not None: | ||
37 | return "virtual/kernel:do_deploy" | ||
38 | 20 | ||
39 | return "" | 21 | return "" |