mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-08 16:13:50 +02:00
u-boot-tools: update to 2022.10.
This commit is contained in:
parent
dbc1fb53a3
commit
0413451a2f
2 changed files with 44 additions and 2 deletions
|
@ -0,0 +1,42 @@
|
||||||
|
>From version 2.38, binutils default to ISA spec version 20191213. This
|
||||||
|
means that the csr read/write (csrr*/csrw*) instructions and fence.i
|
||||||
|
instruction has separated from the `I` extension, become two standalone
|
||||||
|
extensions: Zicsr and Zifencei. As the kernel uses those instruction,
|
||||||
|
this causes the following build failure:
|
||||||
|
|
||||||
|
arch/riscv/cpu/mtrap.S: Assembler messages:
|
||||||
|
arch/riscv/cpu/mtrap.S:65: Error: unrecognized opcode `csrr a0,scause'
|
||||||
|
arch/riscv/cpu/mtrap.S:66: Error: unrecognized opcode `csrr a1,sepc'
|
||||||
|
arch/riscv/cpu/mtrap.S:67: Error: unrecognized opcode `csrr a2,stval'
|
||||||
|
arch/riscv/cpu/mtrap.S:70: Error: unrecognized opcode `csrw sepc,a0'
|
||||||
|
|
||||||
|
Signed-off-by: Alexandre Ghiti <alexandre.ghiti at canonical.com>
|
||||||
|
---
|
||||||
|
arch/riscv/Makefile | 11 ++++++++++-
|
||||||
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
|
||||||
|
index 0b80eb8d86..53d1194ffb 100644
|
||||||
|
--- a/arch/riscv/Makefile
|
||||||
|
+++ b/arch/riscv/Makefile
|
||||||
|
@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y)
|
||||||
|
CMODEL = medany
|
||||||
|
endif
|
||||||
|
|
||||||
|
-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \
|
||||||
|
+RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C)
|
||||||
|
+
|
||||||
|
+# Newer binutils versions default to ISA spec version 20191213 which moves some
|
||||||
|
+# instructions from the I extension to the Zicsr and Zifencei extensions.
|
||||||
|
+toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI) -march=$(RISCV_MARCH)_zicsr_zifencei)
|
||||||
|
+ifeq ($(toolchain-need-zicsr-zifencei),y)
|
||||||
|
+ RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
+ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \
|
||||||
|
-mcmodel=$(CMODEL)
|
||||||
|
|
||||||
|
PLATFORM_CPPFLAGS += $(ARCH_FLAGS)
|
||||||
|
--
|
||||||
|
2.32.0
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'u-boot-tools'
|
# Template file for 'u-boot-tools'
|
||||||
pkgname=u-boot-tools
|
pkgname=u-boot-tools
|
||||||
version=2022.07
|
version=2022.10
|
||||||
revision=1
|
revision=1
|
||||||
wrksrc="u-boot-${version}"
|
wrksrc="u-boot-${version}"
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
|
@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://www.denx.de/wiki/U-Boot/"
|
homepage="https://www.denx.de/wiki/U-Boot/"
|
||||||
distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
|
distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
|
||||||
checksum=92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e
|
checksum=50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
||||||
|
|
Loading…
Add table
Reference in a new issue