From b7b367c5f528868a0ef9a428f015496af4408b9f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 13 Jan 2023 23:27:50 +0100
Subject: [PATCH] u-boot-tools: update to 2023.01.

---
 .../fix-build-with-binutils-2.38.patch        | 42 -------------------
 srcpkgs/u-boot-tools/template                 |  6 +--
 2 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/u-boot-tools/patches/fix-build-with-binutils-2.38.patch

diff --git a/srcpkgs/u-boot-tools/patches/fix-build-with-binutils-2.38.patch b/srcpkgs/u-boot-tools/patches/fix-build-with-binutils-2.38.patch
deleted file mode 100644
index 08e389f54c4..00000000000
--- a/srcpkgs/u-boot-tools/patches/fix-build-with-binutils-2.38.patch
+++ /dev/null
@@ -1,42 +0,0 @@
->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
-
diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index d33d76282cc..03ad4af2018 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,18 +1,18 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
-version=2022.10
+version=2023.01
 revision=1
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=: NO_SDL=1"
 make_build_target="tools-all tools-only envtools"
-hostmakedepends="bison flex which python3 swig python3-devel"
+hostmakedepends="bison flex which python3 swig python3-devel python3-setuptools"
 makedepends="openssl-devel libuuid-devel gnutls-devel ncurses-libtinfo-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.denx.de/wiki/U-Boot/"
 distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
-checksum=50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8
+checksum=69423bad380f89a0916636e89e6dcbd2e4512d584308d922d1039d1e4331950f
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"