diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile
--- a/sysutils/opensbi/Makefile
+++ b/sysutils/opensbi/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	opensbi
 DISTVERSIONPREFIX=v
-DISTVERSION=	1.1
+DISTVERSION=	1.2
 CATEGORIES=	sysutils
 
 MAINTAINER=	mhorne@FreeBSD.org
 COMMENT=	RISC-V SBI bootloader and firmware
-WWW=		https://github.com/riscv/opensbi
+WWW=		https://github.com/riscv-software-src/opensbi
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	bash:shells/bash
+BUILD_DEPENDS=	bash:shells/bash \
+		dtc:sysutils/dtc
 
-USES=		gmake shebangfix
-SHEBANG_FILES=	scripts/*.sh
+USES=		gmake python:build shebangfix
+SHEBANG_FILES=	scripts/Kconfiglib/*.py
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	riscv
+GH_ACCOUNT=	riscv-software-src
 
 MAKE_ARGS=	CC=clang I=${STAGEDIR}${PREFIX} V=1 FW_PAYLOAD=n
 
@@ -34,6 +35,8 @@
 
 PLATFORM_RISCV_ABI=	lp64
 
+do-install: # only need install_firmwares target
+
 .for platform in ${OPTIONS_GROUP_PLATFORMS}
 
 post-build-${platform}-on:
@@ -43,8 +46,6 @@
 	${MKDIR} ${STAGEDIR}${PREFIX}
 	${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} ${MAKE_ARGS} \
 		I=${STAGEDIR}${PREFIX} V=1 install_firmwares
-	${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} ${MAKE_ARGS} \
-		I=${STAGEDIR}${PREFIX} V=1 install_libplatsbi
 
 post-install-${platform}-on:
 	${STRIP_CMD} ${${platform}_STRIP_ARGS} \
diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo
--- a/sysutils/opensbi/distinfo
+++ b/sysutils/opensbi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656188838
-SHA256 (riscv-opensbi-v1.1_GH0.tar.gz) = d183cb890130983a4f01e75fc03ee4f7ea0e16a7923b8af9c6dff7deb2fedaec
-SIZE (riscv-opensbi-v1.1_GH0.tar.gz) = 241383
+TIMESTAMP = 1672591798
+SHA256 (riscv-software-src-opensbi-v1.2_GH0.tar.gz) = 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2
+SIZE (riscv-software-src-opensbi-v1.2_GH0.tar.gz) = 356905
diff --git a/sysutils/opensbi/pkg-plist b/sysutils/opensbi/pkg-plist
--- a/sysutils/opensbi/pkg-plist
+++ b/sysutils/opensbi/pkg-plist
@@ -1,70 +1,3 @@
-include/sbi/fw_dynamic.h
-include/sbi/riscv_asm.h
-include/sbi/riscv_atomic.h
-include/sbi/riscv_barrier.h
-include/sbi/riscv_elf.h
-include/sbi/riscv_encoding.h
-include/sbi/riscv_fp.h
-include/sbi/riscv_io.h
-include/sbi/riscv_locks.h
-include/sbi/sbi_bitmap.h
-include/sbi/sbi_bitops.h
-include/sbi/sbi_console.h
-include/sbi/sbi_const.h
-include/sbi/sbi_csr_detect.h
-include/sbi/sbi_domain.h
-include/sbi/sbi_ecall.h
-include/sbi/sbi_ecall_interface.h
-include/sbi/sbi_emulate_csr.h
-include/sbi/sbi_error.h
-include/sbi/sbi_fifo.h
-include/sbi/sbi_hart.h
-include/sbi/sbi_hartmask.h
-include/sbi/sbi_hfence.h
-include/sbi/sbi_hsm.h
-include/sbi/sbi_illegal_insn.h
-include/sbi/sbi_init.h
-include/sbi/sbi_ipi.h
-include/sbi/sbi_list.h
-include/sbi/sbi_math.h
-include/sbi/sbi_misaligned_ldst.h
-include/sbi/sbi_platform.h
-include/sbi/sbi_pmu.h
-include/sbi/sbi_scratch.h
-include/sbi/sbi_string.h
-include/sbi/sbi_system.h
-include/sbi/sbi_timer.h
-include/sbi/sbi_tlb.h
-include/sbi/sbi_trap.h
-include/sbi/sbi_types.h
-include/sbi/sbi_unpriv.h
-include/sbi/sbi_version.h
-include/sbi_utils/fdt/fdt_domain.h
-include/sbi_utils/fdt/fdt_fixup.h
-include/sbi_utils/fdt/fdt_helper.h
-include/sbi_utils/fdt/fdt_pmu.h
-include/sbi_utils/gpio/fdt_gpio.h
-include/sbi_utils/gpio/gpio.h
-include/sbi_utils/i2c/fdt_i2c.h
-include/sbi_utils/i2c/i2c.h
-include/sbi_utils/ipi/aclint_mswi.h
-include/sbi_utils/ipi/fdt_ipi.h
-include/sbi_utils/irqchip/fdt_irqchip.h
-include/sbi_utils/irqchip/plic.h
-include/sbi_utils/reset/fdt_reset.h
-include/sbi_utils/serial/fdt_serial.h
-include/sbi_utils/serial/gaisler-uart.h
-include/sbi_utils/serial/litex-uart.h
-include/sbi_utils/serial/shakti-uart.h
-include/sbi_utils/serial/sifive-uart.h
-include/sbi_utils/serial/uart8250.h
-include/sbi_utils/sys/htif.h
-include/sbi_utils/sys/sifive_test.h
-include/sbi_utils/timer/aclint_mtimer.h
-include/sbi_utils/timer/fdt_timer.h
-lib64/%%RISCV_ABI%%/libsbi.a
-lib64/%%RISCV_ABI%%/libsbiutils.a
-%%GENERIC%%lib64/%%RISCV_ABI%%/opensbi/generic/lib/libplatsbi.a
 %%GENERIC%%%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_dynamic.bin
 %%GENERIC%%%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_dynamic.elf
 %%GENERIC%%%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_jump.bin
diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile
--- a/sysutils/u-boot-sifive-fu540/Makefile
+++ b/sysutils/u-boot-sifive-fu540/Makefile
@@ -1,5 +1,7 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2022.10=	1
+
 MODEL=		sifive-fu540
 BOARD_CONFIG=	sifive_unleashed_defconfig
 FAMILY=		sifive
diff --git a/sysutils/u-boot-sifive-fu740/Makefile b/sysutils/u-boot-sifive-fu740/Makefile
--- a/sysutils/u-boot-sifive-fu740/Makefile
+++ b/sysutils/u-boot-sifive-fu740/Makefile
@@ -1,5 +1,7 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2022.10=	1
+
 MODEL=		sifive-fu740
 BOARD_CONFIG=	sifive_unmatched_defconfig
 FAMILY=		sifive