Index: sysutils/opensbi/opensbi.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/opensbi/opensbi.mk,v
retrieving revision 1.2
diff -u -p -r1.2 opensbi.mk
--- sysutils/opensbi/opensbi.mk	17 Jun 2024 21:53:57 -0000	1.2
+++ sysutils/opensbi/opensbi.mk	30 May 2026 12:01:36 -0000
@@ -17,10 +17,20 @@ COMMENT=		RISC-V Open Source Supervisor 
 LICENSE=		2-clause-bsd
 
 USE_TOOLS+=		gmake
+
+.include "../../mk/bsd.prefs.mk"
+
 TOOL_DEPENDS+=		dtc>=1.4.2:../../sysutils/dtc
+
+.if ${CROSS_MACHINE_ARCH} == "riscv64"
+OPENSBI_ENV+=		CROSS_COMPILE=${TOOLDIR}/bin/riscv64--netbsd-
+.else
+
 BUILD_DEPENDS+=		cross-riscv64-none-elf-gcc-[0-9]*:../../cross/riscv64-none-elf-gcc
 
 OPENSBI_ENV+=		CROSS_COMPILE=${PREFIX}/cross-riscv64-none-elf/bin/riscv64-none-elf-
+.endif
+
 OPENSBI_ENV+=		PLATFORM=${OPENSBI_PLATFORM}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
Index: sysutils/u-boot/u-boot-riscv64.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot/u-boot-riscv64.mk,v
retrieving revision 1.1
diff -u -p -r1.1 u-boot-riscv64.mk
--- sysutils/u-boot/u-boot-riscv64.mk	13 May 2024 23:07:14 -0000	1.1
+++ sysutils/u-boot/u-boot-riscv64.mk	30 May 2026 12:01:36 -0000
@@ -1,8 +1,17 @@
 # $NetBSD: u-boot-riscv64.mk,v 1.1 2024/05/13 23:07:14 gutteridge Exp $
 
 MAINTAINER=	port-riscv@NetBSD.org
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${CROSS_MACHINE_ARCH} == "riscv64"
+UBOOT_ENV+=	CROSS_COMPILE=${TOOLDIR}/bin/riscv64--netbsd-
+.else
+
 TOOL_DEPENDS+=	cross-riscv64-none-elf-gcc-[0-9]*:../../cross/riscv64-none-elf-gcc
 
 UBOOT_ENV+=	CROSS_COMPILE=${PREFIX}/cross-riscv64-none-elf/bin/riscv64-none-elf-
 
+.endif
+
 .include "u-boot.mk"