diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile
index 1391f5099c90..fb8b248abac6 100644
--- a/sysutils/opensbi/Makefile
+++ b/sysutils/opensbi/Makefile
@@ -1,58 +1,50 @@
 PORTNAME=	opensbi
 DISTVERSIONPREFIX=v
-DISTVERSION=	0.9
+DISTVERSION=	1.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	mhorne@FreeBSD.org
 COMMENT=	RISC-V SBI bootloader and firmware
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${RISCV_PREFIX}gcc:devel/riscv64-none-elf-gcc \
-		${RISCV_PREFIX}ld:devel/binutils@riscv64_none_elf
-
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	riscv
 
-RISCV_PREFIX=	riscv64-none-elf-
-
-MAKE_ARGS=	CROSS_COMPILE=${RISCV_PREFIX} I=${STAGEDIR}${PREFIX} FW_PAYLOAD=n
+MAKE_ARGS=	CC=clang I=${STAGEDIR}${PREFIX} V=1 FW_PAYLOAD=n
 
 OPTIONS_GROUP=		PLATFORMS
-OPTIONS_GROUP_PLATFORMS=GENERIC SIFIVE_FU540
+OPTIONS_GROUP_PLATFORMS=GENERIC
 OPTIONS_SUB=		yes
-OPTIONS_DEFAULT=	GENERIC SIFIVE_FU540
+OPTIONS_DEFAULT=	GENERIC
 
 GENERIC_DESC=		Support for generic platform
 GENERIC_PLATFORM=	generic
 GENERIC_STRIP_ARGS=	-K tohost -K fromhost
 
-SIFIVE_FU540_DESC=	Support for SiFive U540 platform
-SIFIVE_FU540_PLATFORM=	sifive/fu540
-
 INSTALL_TARGET=		install
 
 PLIST_SUB+=		RISCV_ABI=${PLATFORM_RISCV_ABI}
 
 PLATFORM_RISCV_ABI=	lp64
 
 .for platform in ${OPTIONS_GROUP_PLATFORMS}
 
 post-build-${platform}-on:
 	${MAKE_CMD} -C ${WRKSRC} ${MAKE_ARGS} PLATFORM=${${platform}_PLATFORM}
 
 do-install-${platform}-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}
 	${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} ${MAKE_ARGS} \
-		I=${STAGEDIR}${PREFIX} install_firmwares
+		I=${STAGEDIR}${PREFIX} V=1 install_firmwares
 	${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} ${MAKE_ARGS} \
-		I=${STAGEDIR}${PREFIX} install_libplatsbi
+		I=${STAGEDIR}${PREFIX} V=1 install_libplatsbi
 
 post-install-${platform}-on:
 	${STRIP_CMD} ${${platform}_STRIP_ARGS} \
 	    ${STAGEDIR}${DATADIR}/${PLATFORM_RISCV_ABI}/${${platform}_PLATFORM}/firmware/fw_*.elf
 
 .endfor # OPTIONS_GROUP_PLATFORMS
 
 .include <bsd.port.mk>
diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo
index e7c663bbcc9c..6a679cea4bfb 100644
--- a/sysutils/opensbi/distinfo
+++ b/sysutils/opensbi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610993580
-SHA256 (riscv-opensbi-v0.9_GH0.tar.gz) = 60f995cb3cd03e3cf5e649194d3395d0fe67499fd960a36cf7058a4efde686f0
-SIZE (riscv-opensbi-v0.9_GH0.tar.gz) = 189688
+TIMESTAMP = 1641325249
+SHA256 (riscv-opensbi-v1.0_GH0.tar.gz) = a5efaeb24f5ee88d13d5788e4e00623ff312ee12c0bf736aa75a6ad9a850fb76
+SIZE (riscv-opensbi-v1.0_GH0.tar.gz) = 225774
diff --git a/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c b/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c
index 184d17771466..e9b4ed6abde2 100644
--- a/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c
+++ b/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c
@@ -1,19 +1,19 @@
---- lib/sbi/sbi_hart.c.orig	2021-01-30 20:30:32 UTC
+--- lib/sbi/sbi_hart.c.orig	2021-12-24 11:57:44 UTC
 +++ lib/sbi/sbi_hart.c
-@@ -188,6 +188,16 @@ int sbi_hart_pmp_configure(struct sbi_scratch *scratch
+@@ -203,6 +203,16 @@ int sbi_hart_pmp_configure(struct sbi_scratch *scratch
  	if (!pmp_count)
  		return 0;
  
 +	/*
 +	 * Disable the PMP for the sifive/fu540 platform, required to work
 +	 * around a hardware errata.
 +	 */
 +	extern int need_pmp_war;
 +	if (need_pmp_war) {
 +		pmp_set(0, PMP_R | PMP_W | PMP_X, -1, __riscv_xlen);
 +		return 0;
 +	}
 +
  	pmp_gran_log2 = log2roundup(sbi_hart_pmp_granularity(scratch));
  	pmp_bits = sbi_hart_pmp_addrbits(scratch) - 1;
  	pmp_addr_max = (1UL << pmp_bits) | ((1UL << pmp_bits) - 1);
diff --git a/sysutils/opensbi/files/patch-platform_generic_platform.c b/sysutils/opensbi/files/patch-platform_generic_platform.c
index 39a427424842..5d39f954ee76 100644
--- a/sysutils/opensbi/files/patch-platform_generic_platform.c
+++ b/sysutils/opensbi/files/patch-platform_generic_platform.c
@@ -1,11 +1,11 @@
---- platform/generic/platform.c.orig	2021-01-30 20:29:48 UTC
+--- platform/generic/platform.c.orig	2021-12-24 11:57:44 UTC
 +++ platform/generic/platform.c
-@@ -22,6 +22,8 @@
+@@ -23,6 +23,8 @@
  #include <sbi_utils/ipi/fdt_ipi.h>
  #include <sbi_utils/reset/fdt_reset.h>
  
 +int need_pmp_war = FALSE;
 +
  extern const struct platform_override sifive_fu540;
+ extern const struct platform_override sifive_fu740;
  
- static const struct platform_override *special_platforms[] = {
diff --git a/sysutils/opensbi/files/patch-platform_generic_sifive__fu540.c b/sysutils/opensbi/files/patch-platform_generic_sifive__fu540.c
new file mode 100644
index 000000000000..bdd0dce39569
--- /dev/null
+++ b/sysutils/opensbi/files/patch-platform_generic_sifive__fu540.c
@@ -0,0 +1,26 @@
+--- platform/generic/sifive_fu540.c.orig	2021-12-24 11:57:44 UTC
++++ platform/generic/sifive_fu540.c
+@@ -11,6 +11,15 @@
+ #include <sbi_utils/fdt/fdt_helper.h>
+ #include <sbi_utils/fdt/fdt_fixup.h>
+ 
++extern int need_pmp_war;
++
++static int sifive_fu540_early_init(bool cold_boot, const struct fdt_match *match)
++{
++	need_pmp_war = TRUE;
++
++	return 0;
++}
++
+ static u64 sifive_fu540_tlbr_flush_limit(const struct fdt_match *match)
+ {
+ 	/*
+@@ -41,6 +50,7 @@ static const struct fdt_match sifive_fu540_match[] = {
+ };
+ 
+ const struct platform_override sifive_fu540 = {
++	.early_init = sifive_fu540_early_init,
+ 	.match_table = sifive_fu540_match,
+ 	.tlbr_flush_limit = sifive_fu540_tlbr_flush_limit,
+ 	.fdt_fixup = sifive_fu540_fdt_fixup,
diff --git a/sysutils/opensbi/files/patch-platform_sifive_fu540_platform.c b/sysutils/opensbi/files/patch-platform_sifive_fu540_platform.c
deleted file mode 100644
index b0662361545d..000000000000
--- a/sysutils/opensbi/files/patch-platform_sifive_fu540_platform.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- platform/sifive/fu540/platform.c.orig	2021-01-30 20:28:07 UTC
-+++ platform/sifive/fu540/platform.c
-@@ -20,6 +20,7 @@
- #include <sbi_utils/sys/clint.h>
- 
- /* clang-format off */
-+int need_pmp_war = TRUE;
- 
- #define FU540_HART_COUNT			5
- 
diff --git a/sysutils/opensbi/pkg-plist b/sysutils/opensbi/pkg-plist
index c28e264b8902..6a660f894053 100644
--- a/sysutils/opensbi/pkg-plist
+++ b/sysutils/opensbi/pkg-plist
@@ -1,66 +1,71 @@
 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/clint.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
 %%GENERIC%%%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_jump.elf
-%%SIFIVE_FU540%%lib64/%%RISCV_ABI%%/opensbi/sifive/fu540/lib/libplatsbi.a
-%%SIFIVE_FU540%%%%DATADIR%%/%%RISCV_ABI%%/sifive/fu540/firmware/fw_dynamic.bin
-%%SIFIVE_FU540%%%%DATADIR%%/%%RISCV_ABI%%/sifive/fu540/firmware/fw_dynamic.elf
-%%SIFIVE_FU540%%%%DATADIR%%/%%RISCV_ABI%%/sifive/fu540/firmware/fw_jump.bin
-%%SIFIVE_FU540%%%%DATADIR%%/%%RISCV_ABI%%/sifive/fu540/firmware/fw_jump.elf
diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile
index be02869fb2ac..3fba52d998dc 100644
--- a/sysutils/u-boot-sifive-fu540/Makefile
+++ b/sysutils/u-boot-sifive-fu540/Makefile
@@ -1,16 +1,18 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2021.07=1
+
 MODEL=		sifive-fu540
 BOARD_CONFIG=	sifive_unleashed_defconfig
 FAMILY=		sifive
 UBOOT_ARCH=	riscv64
 
 # The FIT image will embed an OpenSBI firmware binary
-OPENSBI_FIRM=	${LOCALBASE}/share/opensbi/lp64/sifive/fu540/firmware/fw_dynamic.bin
+OPENSBI_FIRM=	${LOCALBASE}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin
 BUILD_DEPENDS+=	${OPENSBI_FIRM}:sysutils/opensbi
 MAKE_ENV+=	OPENSBI=${OPENSBI_FIRM}
 
 UBOOT_MOVE=	${WRKSRC}/spl/u-boot-spl.bin
 UBOOT_PLIST=	u-boot.itb u-boot-spl.bin
 
 .include "${MASTERDIR}/Makefile"