* Re: [Buildroot] [PATCH 1/2] boot/opensbi: Bump to version 1.0
[not found] <20220401063930.2158692-1-alistair.francis@opensource.wdc.com>
@ 2022-04-27 5:41 ` Alistair Francis
2022-04-27 7:33 ` Arnout Vandecappelle
0 siblings, 1 reply; 2+ messages in thread
From: Alistair Francis @ 2022-04-27 5:41 UTC (permalink / raw)
To: Alistair Francis; +Cc: Alistair Francis, buildroot
On Fri, Apr 1, 2022 at 4:39 PM Alistair Francis
<alistair.francis@opensource.wdc.com> wrote:
>
> From: Alistair Francis <alistair.francis@wdc.com>
>
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Ping!
Alistair
> ---
> ...Makefile-Don-t-specify-mabi-or-march.patch | 37 -------------
> ...Makefile-unconditionally-disable-SSP.patch | 53 -------------------
> boot/opensbi/Config.in | 4 +-
> boot/opensbi/opensbi.hash | 2 +-
> 4 files changed, 3 insertions(+), 93 deletions(-)
> delete mode 100644 boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch
> delete mode 100644 boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch
>
> diff --git a/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch b/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch
> deleted file mode 100644
> index 5f554a6c24..0000000000
> --- a/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From f5871e1f3650d6c8a032928cb5d8ca00c275c377 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.
> -
> -Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ----
> - Makefile | 2 --
> - 1 file changed, 2 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index ae68f55..10851fc 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -145,7 +145,6 @@ GENFLAGS += $(firmware-genflags-y)
> - CFLAGS = -g -Wall -Werror -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)
> -@@ -158,7 +157,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)
> ---
> -2.20.1
> -
> diff --git a/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch b/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch
> deleted file mode 100644
> index c4edd37f1a..0000000000
> --- a/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -From e389d5fbc296e496db15368b2b621e0f178f7f34 Mon Sep 17 00:00:00 2001
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Sat, 8 May 2021 21:28:10 +0200
> -Subject: [PATCH] Makefile: unconditionally disable SSP
> -
> -Though -nostdlib is passed in {C,+AS,DTSCPP}FLAGS, -fno-stack-protector
> -must also be passed to avoid linking errors related to undefined
> -references to '__stack_chk_guard' and '__stack_chk_fail' if toolchain
> -enforces -fstack-protector.
> -
> -Fixes:
> - - https://gitlab.com/kubu93/buildroot/-/jobs/1247043359
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status: https://github.com/riscv/opensbi/pull/211]
> ----
> - Makefile | 6 +++---
> - 1 file changed, 3 insertions(+), 3 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index eeffe6b..1419360 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -203,7 +203,7 @@ GENFLAGS += $(libsbiutils-genflags-y)
> - GENFLAGS += $(platform-genflags-y)
> - GENFLAGS += $(firmware-genflags-y)
> -
> --CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2
> -+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-stack-protector -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)
> -@@ -217,7 +217,7 @@ CPPFLAGS += $(GENFLAGS)
> - CPPFLAGS += $(platform-cppflags-y)
> - CPPFLAGS += $(firmware-cppflags-y)
> -
> --ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__
> -+ASFLAGS = -g -Wall -nostdlib -fno-stack-protector -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)
> -@@ -236,7 +236,7 @@ MERGEFLAGS += -r
> - MERGEFLAGS += -b elf$(PLATFORM_RISCV_XLEN)-littleriscv
> - MERGEFLAGS += -m elf$(PLATFORM_RISCV_XLEN)lriscv
> -
> --DTSCPPFLAGS = $(CPPFLAGS) -nostdinc -nostdlib -fno-builtin -D__DTS__ -x assembler-with-cpp
> -+DTSCPPFLAGS = $(CPPFLAGS) -nostdinc -nostdlib -fno-stack-protector -fno-builtin -D__DTS__ -x assembler-with-cpp
> -
> - # Setup functions for compilation
> - define dynamic_flags
> ---
> -2.30.2
> -
> diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in
> index f1443498d9..1e1bdc344b 100644
> --- a/boot/opensbi/Config.in
> +++ b/boot/opensbi/Config.in
> @@ -19,7 +19,7 @@ choice
> Select the specific OpenSBI version you want to use
>
> config BR2_TARGET_OPENSBI_LATEST_VERSION
> - bool "0.9"
> + bool "1.0"
>
> config BR2_TARGET_OPENSBI_CUSTOM_VERSION
> bool "Custom version"
> @@ -57,7 +57,7 @@ endif
>
> config BR2_TARGET_OPENSBI_VERSION
> string
> - default "0.9" if BR2_TARGET_OPENSBI_LATEST_VERSION
> + default "1.0" if BR2_TARGET_OPENSBI_LATEST_VERSION
> default BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE \
> if BR2_TARGET_OPENSBI_CUSTOM_VERSION
> default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL
> diff --git a/boot/opensbi/opensbi.hash b/boot/opensbi/opensbi.hash
> index 3b6d97c42d..1a626e6357 100644
> --- a/boot/opensbi/opensbi.hash
> +++ b/boot/opensbi/opensbi.hash
> @@ -1,3 +1,3 @@
> # locally computed
> -sha256 60f995cb3cd03e3cf5e649194d3395d0fe67499fd960a36cf7058a4efde686f0 opensbi-0.9.tar.gz
> +sha256 a5efaeb24f5ee88d13d5788e4e00623ff312ee12c0bf736aa75a6ad9a850fb76 opensbi-1.0.tar.gz
> sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD
> --
> 2.35.1
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/2] boot/opensbi: Bump to version 1.0
2022-04-27 5:41 ` [Buildroot] [PATCH 1/2] boot/opensbi: Bump to version 1.0 Alistair Francis
@ 2022-04-27 7:33 ` Arnout Vandecappelle
0 siblings, 0 replies; 2+ messages in thread
From: Arnout Vandecappelle @ 2022-04-27 7:33 UTC (permalink / raw)
To: Alistair Francis, Alistair Francis; +Cc: Alistair Francis, buildroot
On 27/04/2022 07:41, Alistair Francis wrote:
> On Fri, Apr 1, 2022 at 4:39 PM Alistair Francis
> <alistair.francis@opensource.wdc.com> wrote:
>>
>> From: Alistair Francis <alistair.francis@wdc.com>
>>
>> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
>
> Ping!
This patch didn't make it to patchwork, and I also don't find it in my
mailbox. Maybe it didn't even make it to the mailing list?
Can you resend please?
Regards,
Arnout
>
> Alistair
>
>> ---
>> ...Makefile-Don-t-specify-mabi-or-march.patch | 37 -------------
>> ...Makefile-unconditionally-disable-SSP.patch | 53 -------------------
>> boot/opensbi/Config.in | 4 +-
>> boot/opensbi/opensbi.hash | 2 +-
>> 4 files changed, 3 insertions(+), 93 deletions(-)
>> delete mode 100644 boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch
>> delete mode 100644 boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch
>>
>> diff --git a/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch b/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch
>> deleted file mode 100644
>> index 5f554a6c24..0000000000
>> --- a/boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch
>> +++ /dev/null
>> @@ -1,37 +0,0 @@
>> -From f5871e1f3650d6c8a032928cb5d8ca00c275c377 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.
>> -
>> -Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
>> ----
>> - Makefile | 2 --
>> - 1 file changed, 2 deletions(-)
>> -
>> -diff --git a/Makefile b/Makefile
>> -index ae68f55..10851fc 100644
>> ---- a/Makefile
>> -+++ b/Makefile
>> -@@ -145,7 +145,6 @@ GENFLAGS += $(firmware-genflags-y)
>> - CFLAGS = -g -Wall -Werror -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)
>> -@@ -158,7 +157,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)
>> ---
>> -2.20.1
>> -
>> diff --git a/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch b/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch
>> deleted file mode 100644
>> index c4edd37f1a..0000000000
>> --- a/boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch
>> +++ /dev/null
>> @@ -1,53 +0,0 @@
>> -From e389d5fbc296e496db15368b2b621e0f178f7f34 Mon Sep 17 00:00:00 2001
>> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>> -Date: Sat, 8 May 2021 21:28:10 +0200
>> -Subject: [PATCH] Makefile: unconditionally disable SSP
>> -
>> -Though -nostdlib is passed in {C,+AS,DTSCPP}FLAGS, -fno-stack-protector
>> -must also be passed to avoid linking errors related to undefined
>> -references to '__stack_chk_guard' and '__stack_chk_fail' if toolchain
>> -enforces -fstack-protector.
>> -
>> -Fixes:
>> - - https://gitlab.com/kubu93/buildroot/-/jobs/1247043359
>> -
>> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>> -[Upstream status: https://github.com/riscv/opensbi/pull/211]
>> ----
>> - Makefile | 6 +++---
>> - 1 file changed, 3 insertions(+), 3 deletions(-)
>> -
>> -diff --git a/Makefile b/Makefile
>> -index eeffe6b..1419360 100644
>> ---- a/Makefile
>> -+++ b/Makefile
>> -@@ -203,7 +203,7 @@ GENFLAGS += $(libsbiutils-genflags-y)
>> - GENFLAGS += $(platform-genflags-y)
>> - GENFLAGS += $(firmware-genflags-y)
>> -
>> --CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2
>> -+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-stack-protector -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)
>> -@@ -217,7 +217,7 @@ CPPFLAGS += $(GENFLAGS)
>> - CPPFLAGS += $(platform-cppflags-y)
>> - CPPFLAGS += $(firmware-cppflags-y)
>> -
>> --ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__
>> -+ASFLAGS = -g -Wall -nostdlib -fno-stack-protector -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)
>> -@@ -236,7 +236,7 @@ MERGEFLAGS += -r
>> - MERGEFLAGS += -b elf$(PLATFORM_RISCV_XLEN)-littleriscv
>> - MERGEFLAGS += -m elf$(PLATFORM_RISCV_XLEN)lriscv
>> -
>> --DTSCPPFLAGS = $(CPPFLAGS) -nostdinc -nostdlib -fno-builtin -D__DTS__ -x assembler-with-cpp
>> -+DTSCPPFLAGS = $(CPPFLAGS) -nostdinc -nostdlib -fno-stack-protector -fno-builtin -D__DTS__ -x assembler-with-cpp
>> -
>> - # Setup functions for compilation
>> - define dynamic_flags
>> ---
>> -2.30.2
>> -
>> diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in
>> index f1443498d9..1e1bdc344b 100644
>> --- a/boot/opensbi/Config.in
>> +++ b/boot/opensbi/Config.in
>> @@ -19,7 +19,7 @@ choice
>> Select the specific OpenSBI version you want to use
>>
>> config BR2_TARGET_OPENSBI_LATEST_VERSION
>> - bool "0.9"
>> + bool "1.0"
>>
>> config BR2_TARGET_OPENSBI_CUSTOM_VERSION
>> bool "Custom version"
>> @@ -57,7 +57,7 @@ endif
>>
>> config BR2_TARGET_OPENSBI_VERSION
>> string
>> - default "0.9" if BR2_TARGET_OPENSBI_LATEST_VERSION
>> + default "1.0" if BR2_TARGET_OPENSBI_LATEST_VERSION
>> default BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE \
>> if BR2_TARGET_OPENSBI_CUSTOM_VERSION
>> default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL
>> diff --git a/boot/opensbi/opensbi.hash b/boot/opensbi/opensbi.hash
>> index 3b6d97c42d..1a626e6357 100644
>> --- a/boot/opensbi/opensbi.hash
>> +++ b/boot/opensbi/opensbi.hash
>> @@ -1,3 +1,3 @@
>> # locally computed
>> -sha256 60f995cb3cd03e3cf5e649194d3395d0fe67499fd960a36cf7058a4efde686f0 opensbi-0.9.tar.gz
>> +sha256 a5efaeb24f5ee88d13d5788e4e00623ff312ee12c0bf736aa75a6ad9a850fb76 opensbi-1.0.tar.gz
>> sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD
>> --
>> 2.35.1
>>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-27 7:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20220401063930.2158692-1-alistair.francis@opensource.wdc.com>
2022-04-27 5:41 ` [Buildroot] [PATCH 1/2] boot/opensbi: Bump to version 1.0 Alistair Francis
2022-04-27 7:33 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.