summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2020-02-24 10:35:43 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-28 23:11:28 +0000
commitdd3568a37f3916799cac85ca3e89f9dccbd16c50 (patch)
tree48fd5439094db0a446fd01818c4cb295c7ad0a90 /meta/recipes-bsp
parentc9426ff8e4db0a49a79276dc57821e377d8d8546 (diff)
downloadpoky-dd3568a37f3916799cac85ca3e89f9dccbd16c50.tar.gz
opensbi: Update to v0.6
(From OE-Core rev: 20e9ca7745fc8f2392c37c5e5e8d5b0a5f72c06c) Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch13
-rw-r--r--meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch28
-rw-r--r--meta/recipes-bsp/opensbi/opensbi_0.6.bb (renamed from meta/recipes-bsp/opensbi/opensbi_0.5.bb)6
3 files changed, 9 insertions, 38 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
index 74d93618b2..d2a8048e87 100644
--- 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
@@ -1,4 +1,4 @@
1From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001 1From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair.francis@wdc.com> 2From: Alistair Francis <alistair.francis@wdc.com>
3Date: Fri, 15 Feb 2019 14:57:41 -0800 3Date: Fri, 15 Feb 2019 14:57:41 -0800
4Subject: [PATCH] Makefile: Don't specify mabi or march 4Subject: [PATCH] Makefile: Don't specify mabi or march
@@ -7,23 +7,26 @@ To avoid
7 can't link double-float modules with soft-float modules 7 can't link double-float modules with soft-float modules
8errors when building 32-bit openSBI don't specify mabi or march. 8errors when building 32-bit openSBI don't specify mabi or march.
9 9
10Upstream-Status: Inappropriate [Fixes a 32-bit Yocto flow bug] 10Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug]
11Signed-off-by: Alistair Francis <alistair.francis@wdc.com> 11Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
12
12--- 13---
13 Makefile | 2 -- 14 Makefile | 2 --
14 1 file changed, 2 deletions(-) 15 1 file changed, 2 deletions(-)
15 16
17diff --git a/Makefile b/Makefile
18index ccf8ea3..69e5b38 100644
16--- a/Makefile 19--- a/Makefile
17+++ b/Makefile 20+++ b/Makefile
18@@ -162,7 +162,6 @@ GENFLAGS += $(firmware-genflags-y) 21@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y)
19 CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 22 CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2
20 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls 23 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
21 CFLAGS += -mno-save-restore -mstrict-align 24 CFLAGS += -mno-save-restore -mstrict-align
22-CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) 25-CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA)
23 CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) 26 CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL)
24 CFLAGS += $(GENFLAGS) 27 CFLAGS += $(GENFLAGS)
25 CFLAGS += $(platform-cflags-y) 28 CFLAGS += $(platform-cflags-y)
26@@ -176,7 +175,6 @@ CPPFLAGS += $(firmware-cppflags-y) 29@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y)
27 ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ 30 ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__
28 ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls 31 ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
29 ASFLAGS += -mno-save-restore -mstrict-align 32 ASFLAGS += -mno-save-restore -mstrict-align
diff --git a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch b/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch
deleted file mode 100644
index 4899fad6aa..0000000000
--- a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From efa39afecedf75a1f3154c39507bdde2810bc140 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Jan 2020 18:21:02 -0800
4Subject: [PATCH] build: Use -ffreestanding
5
6this is a stand-alone/baremetal application, therefore demanding
7-ffreestanding would help it compile with hosted toolchains e.g. ( linux
8toolchains ), it also ensures that it won't be using platform
9optimizations like inlining mem* str* functions which gcc might decide
10especially with wrapper string functions in opensbi code
11
12Upstream-Status: Accepted [https://github.com/riscv/opensbi/commit/049ad0b3877352527ab470eba33bc767e9b54961]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 Makefile | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18--- a/Makefile
19+++ b/Makefile
20@@ -159,7 +159,7 @@ GENFLAGS += $(libsbiutils-genflags-y)
21 GENFLAGS += $(platform-genflags-y)
22 GENFLAGS += $(firmware-genflags-y)
23
24-CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2
25+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2
26 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
27 CFLAGS += -mno-save-restore -mstrict-align
28 CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL)
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.6.bb
index 71d64fa324..56f2d4b915 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.6.bb
@@ -7,17 +7,13 @@ require opensbi-payloads.inc
7 7
8inherit autotools-brokensep deploy 8inherit autotools-brokensep deploy
9 9
10SRCREV = "be92da280d87c38a2e0adc5d3f43bab7b5468f09" 10SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862"
11SRC_URI = "git://github.com/riscv/opensbi.git \ 11SRC_URI = "git://github.com/riscv/opensbi.git \
12 file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ 12 file://0001-Makefile-Don-t-specify-mabi-or-march.patch \
13 file://0001-build-Use-ffreestanding.patch \
14 " 13 "
15 14
16S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
17 16
18SRC_URI[md5sum] = "621f38d8205ef5fb185e4055025e73df"
19SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a224be300"
20
21EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" 17EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}"
22# If RISCV_SBI_PAYLOAD is set then include it as a payload 18# If RISCV_SBI_PAYLOAD is set then include it as a payload
23EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" 19EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}"