summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2020-01-30 15:04:23 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-02 16:57:21 +0000
commit2b9781da7c6d60f8d0ddb36de2666b1ba702f551 (patch)
tree5e81cef3d85d2e3b521a5304e7e703cf70f54955
parent86511f94c992eca945607b864e935c34fcc146ab (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-bsp/opensbi/opensbi-payloads.inc20
-rw-r--r--meta/recipes-bsp/opensbi/opensbi_0.5.bb4
2 files changed, 2 insertions, 22 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
10def 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
19def riscv_get_do_compile_depends(d): 10def 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 ""
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.5.bb
index 6a9026254c..71d64fa324 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.5.bb
@@ -2,7 +2,6 @@ SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)"
2DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration." 2DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration."
3LICENSE = "BSD-2-Clause" 3LICENSE = "BSD-2-Clause"
4LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" 4LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5"
5DEPENDS += "dtc-native"
6 5
7require opensbi-payloads.inc 6require opensbi-payloads.inc
8 7
@@ -21,7 +20,7 @@ SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a22
21 20
22EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" 21EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}"
23# If RISCV_SBI_PAYLOAD is set then include it as a payload 22# If RISCV_SBI_PAYLOAD is set then include it as a payload
24EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)} ${@riscv_get_extra_oemake_fdt(d)}" 23EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}"
25 24
26# Required if specifying a custom payload 25# Required if specifying a custom payload
27do_compile[depends] += "${@riscv_get_do_compile_depends(d)}" 26do_compile[depends] += "${@riscv_get_do_compile_depends(d)}"
@@ -47,7 +46,6 @@ FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*"
47FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*" 46FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*"
48FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" 47FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
49 48
50
51COMPATIBLE_HOST = "(riscv64|riscv32).*" 49COMPATIBLE_HOST = "(riscv64|riscv32).*"
52INHIBIT_PACKAGE_STRIP = "1" 50INHIBIT_PACKAGE_STRIP = "1"
53 51