summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2020-06-24 12:27:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-28 08:35:59 +0100
commitbadc7c486de84eafe1322d0c92f777c2d3b26481 (patch)
treec8283035e87fad6295fa17448440e4cddf705be5 /meta
parentd20e14ba44af32982faa0767f34dc358ef9efb32 (diff)
downloadpoky-badc7c486de84eafe1322d0c92f777c2d3b26481.tar.gz
opensbi: Update to OpenSBI v0.8 release
(From OE-Core rev: f160800ec79973a5e8d8454fe3d695729a993f8b) Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/include/riscv/qemuriscv.inc2
-rw-r--r--meta/recipes-bsp/opensbi/opensbi_0.8.bb (renamed from meta/recipes-bsp/opensbi/opensbi_0.6.bb)21
2 files changed, 11 insertions, 12 deletions
diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc
index a42346f361..759c8a196e 100644
--- a/meta/conf/machine/include/riscv/qemuriscv.inc
+++ b/meta/conf/machine/include/riscv/qemuriscv.inc
@@ -18,7 +18,7 @@ WKS_FILE ?= "qemuriscv.wks"
18MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" 18MACHINE_EXTRA_RRECOMMENDS += " kernel-modules"
19 19
20EXTRA_IMAGEDEPENDS += "opensbi" 20EXTRA_IMAGEDEPENDS += "opensbi"
21RISCV_SBI_PLAT ?= "qemu/virt" 21RISCV_SBI_PLAT ?= "generic"
22RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin" 22RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin"
23 23
24UBOOT_ENTRYPOINT_riscv32 = "0x80400000" 24UBOOT_ENTRYPOINT_riscv32 = "0x80400000"
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.6.bb b/meta/recipes-bsp/opensbi/opensbi_0.8.bb
index 56f2d4b915..818efac733 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.6.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.8.bb
@@ -7,8 +7,8 @@ require opensbi-payloads.inc
7 7
8inherit autotools-brokensep deploy 8inherit autotools-brokensep deploy
9 9
10SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862" 10SRCREV = "a98258d0b537a295f517bbc8d813007336731fa9"
11SRC_URI = "git://github.com/riscv/opensbi.git \ 11SRC_URI = "git://github.com/riscv/opensbi.git;branch=master \
12 file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ 12 file://0001-Makefile-Don-t-specify-mabi-or-march.patch \
13 " 13 "
14 14
@@ -25,22 +25,21 @@ do_install_append() {
25 # In the future these might be required as a dependency for other packages. 25 # In the future these might be required as a dependency for other packages.
26 # At the moment just delete them to avoid warnings 26 # At the moment just delete them to avoid warnings
27 rm -r ${D}/include 27 rm -r ${D}/include
28 rm -r ${D}/platform/${RISCV_SBI_PLAT}/lib 28 rm -r ${D}/lib*
29 rm -r ${D}/platform/${RISCV_SBI_PLAT}/firmware/payloads 29 rm -r ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/payloads
30 rm -r ${D}/lib
31} 30}
32 31
33do_deploy () { 32do_deploy () {
34 install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.* ${DEPLOYDIR}/ 33 install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.* ${DEPLOYDIR}/
35 install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOYDIR}/ 34 install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOYDIR}/
36 install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/ 35 install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/
37} 36}
38 37
39addtask deploy before do_build after do_install 38addtask deploy before do_build after do_install
40 39
41FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*" 40FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.*"
42FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*" 41FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.*"
43FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" 42FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
44 43
45COMPATIBLE_HOST = "(riscv64|riscv32).*" 44COMPATIBLE_HOST = "(riscv64|riscv32).*"
46INHIBIT_PACKAGE_STRIP = "1" 45INHIBIT_PACKAGE_STRIP = "1"