Index: u-boot-arm64.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot/u-boot-arm64.mk,v
retrieving revision 1.2
diff -u -p -r1.2 u-boot-arm64.mk
--- u-boot-arm64.mk	7 Sep 2017 15:30:31 -0000	1.2
+++ u-boot-arm64.mk	25 Feb 2018 13:15:44 -0000
@@ -5,10 +5,7 @@ BUILD_DEPENDS+=	cross-aarch64-none-elf-g
 
 UBOOT_ENV+=	CROSS_COMPILE=${PREFIX}/cross-aarch64-none-elf/bin/aarch64-none-elf-
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.u-boot-${UBOOT_TARGET}
-PKG_SUPPORTED_OPTIONS=	el1
-
-.include "../../mk/bsd.options.mk"
+PKG_SUPPORTED_OPTIONS+=	el1
 
 .if !empty(PKG_OPTIONS:Mel1)
 UBOOT_OPTIONS+=	CONFIG_ARMV8_SWITCH_TO_EL1=y
Index: u-boot.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot/u-boot.mk,v
retrieving revision 1.7
diff -u -p -r1.7 u-boot.mk
--- u-boot.mk	15 Nov 2017 22:08:27 -0000	1.7
+++ u-boot.mk	25 Feb 2018 13:15:44 -0000
@@ -50,5 +50,16 @@ do-install:
 	    ${DESTDIR}${PREFIX}/share/u-boot/${UBOOT_TARGET}
 .endfor
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.u-boot-${UBOOT_TARGET}
+
+PKG_SUPPORTED_OPTIONS+=	ufs
+PKG_SUGGESTED_OPTIONS+=	ufs
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mufs)
+# XXX: ufs!
+.endif
+
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"