diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-02-14 15:37:38 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-16 09:46:25 +0000 |
| commit | c48b57aa68149f5bdca80cadbf5b426c209ca94e (patch) | |
| tree | 3d4734c6a97511f496da1b12579ad77329229946 /meta/recipes-bsp/opensbi | |
| parent | 05e45cb04e72d369aa6db1793cd010096db3cc09 (diff) | |
| download | openembedded-core-c48b57aa68149f5bdca80cadbf5b426c209ca94e.tar.gz | |
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/opensbi')
| -rw-r--r-- | meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-bsp/opensbi/opensbi_1.0.bb (renamed from meta/recipes-bsp/opensbi/opensbi_0.9.bb) | 5 |
2 files changed, 2 insertions, 39 deletions
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 <alistair.francis@wdc.com> -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 <alistair.francis@wdc.com> - ---- - 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_1.0.bb index 1956fbf9ff..8430f62543 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.9.bb +++ b/meta/recipes-bsp/opensbi/opensbi_1.0.bb @@ -8,14 +8,13 @@ require opensbi-payloads.inc inherit autotools-brokensep deploy -SRCREV = "234ed8e427f4d92903123199f6590d144e0d9351" +SRCREV = "ce4c0188d96b2c20c2e08d24646a5e517fe15a4b" 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" +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)}" |