From f23738b9fbf69c8e06fa4fb0d3e7dd80a89fe841 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Feb 2022 15:37:38 -0800 Subject: opensbi: Upgrade to 1.0 Drop OE specific patch to shunt march/mabi this seems to work fine now. unset CLANG_TARGET so it can compile with OE produced clang toolchain which provides --target itself (From OE-Core rev: c48b57aa68149f5bdca80cadbf5b426c209ca94e) Signed-off-by: Khem Raj Cc: Alistair Francis Signed-off-by: Richard Purdie --- ...0001-Makefile-Don-t-specify-mabi-or-march.patch | 36 ---------------- meta/recipes-bsp/opensbi/opensbi_0.9.bb | 49 ---------------------- meta/recipes-bsp/opensbi/opensbi_1.0.bb | 48 +++++++++++++++++++++ 3 files changed, 48 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch delete mode 100644 meta/recipes-bsp/opensbi/opensbi_0.9.bb create mode 100644 meta/recipes-bsp/opensbi/opensbi_1.0.bb diff --git a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch deleted file mode 100644 index d2a8048e87..0000000000 --- a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Fri, 15 Feb 2019 14:57:41 -0800 -Subject: [PATCH] Makefile: Don't specify mabi or march - -To avoid - can't link double-float modules with soft-float modules -errors when building 32-bit openSBI don't specify mabi or march. - -Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug] -Signed-off-by: Alistair Francis - ---- - Makefile | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Makefile b/Makefile -index ccf8ea3..69e5b38 100644 ---- a/Makefile -+++ b/Makefile -@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y) - CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - CFLAGS += -mno-save-restore -mstrict-align --CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) - CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) - CFLAGS += $(GENFLAGS) - CFLAGS += $(platform-cflags-y) -@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y) - ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ - ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - ASFLAGS += -mno-save-restore -mstrict-align --ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) - ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) - ASFLAGS += $(GENFLAGS) - ASFLAGS += $(platform-asflags-y) diff --git a/meta/recipes-bsp/opensbi/opensbi_0.9.bb b/meta/recipes-bsp/opensbi/opensbi_0.9.bb deleted file mode 100644 index 1956fbf9ff..0000000000 --- a/meta/recipes-bsp/opensbi/opensbi_0.9.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" -DESCRIPTION = "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." -HOMEPAGE = "https://github.com/riscv/opensbi" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" - -require opensbi-payloads.inc - -inherit autotools-brokensep deploy - -SRCREV = "234ed8e427f4d92903123199f6590d144e0d9351" -SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \ - file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ - " - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n" -# If RISCV_SBI_PAYLOAD is set then include it as a payload -EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_image(d)}" -EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_fdt(d)}" - -# Required if specifying a custom payload -do_compile[depends] += "${@riscv_get_do_compile_depends(d)}" - -do_install:append() { - # In the future these might be required as a dependency for other packages. - # At the moment just delete them to avoid warnings - rm -r ${D}/include - rm -r ${D}/lib* - rm -r ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/payloads -} - -do_deploy () { - install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.* ${DEPLOYDIR}/ - install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOYDIR}/ - install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/ -} - -addtask deploy before do_build after do_install - -FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.*" -FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.*" -FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" - -COMPATIBLE_HOST = "(riscv64|riscv32).*" -INHIBIT_PACKAGE_STRIP = "1" - -SECURITY_CFLAGS = "" diff --git a/meta/recipes-bsp/opensbi/opensbi_1.0.bb b/meta/recipes-bsp/opensbi/opensbi_1.0.bb new file mode 100644 index 0000000000..8430f62543 --- /dev/null +++ b/meta/recipes-bsp/opensbi/opensbi_1.0.bb @@ -0,0 +1,48 @@ +SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" +DESCRIPTION = "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." +HOMEPAGE = "https://github.com/riscv/opensbi" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" + +require opensbi-payloads.inc + +inherit autotools-brokensep deploy + +SRCREV = "ce4c0188d96b2c20c2e08d24646a5e517fe15a4b" +SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \ + " + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n CLANG_TARGET= " +# If RISCV_SBI_PAYLOAD is set then include it as a payload +EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_image(d)}" +EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_fdt(d)}" + +# Required if specifying a custom payload +do_compile[depends] += "${@riscv_get_do_compile_depends(d)}" + +do_install:append() { + # In the future these might be required as a dependency for other packages. + # At the moment just delete them to avoid warnings + rm -r ${D}/include + rm -r ${D}/lib* + rm -r ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/payloads +} + +do_deploy () { + install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.* ${DEPLOYDIR}/ + install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOYDIR}/ + install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/ +} + +addtask deploy before do_build after do_install + +FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.*" +FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.*" +FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" + +COMPATIBLE_HOST = "(riscv64|riscv32).*" +INHIBIT_PACKAGE_STRIP = "1" + +SECURITY_CFLAGS = "" -- cgit v1.2.3-54-g00ecf