Index: sysutils/u-boot-master/Makefile
===================================================================
--- sysutils/u-boot-master/Makefile
+++ sysutils/u-boot-master/Makefile
@@ -75,8 +75,8 @@
 UBOOT_METADATA_ALLWINNER64_RAW_BS=	1k
 
 # Overrides for Zynq 7000 family
-UBOOT_PLIST_ZYNQ_7000=u-boot.img boot.bin uEnv.txt
-UBOOT_MOVE_ZYNQ_7000=${WRKSRC}/spl/boot.bin ${.CURDIR}/files/uEnv.txt
+UBOOT_PLIST_ZYNQ_7000=u-boot.img boot.bin
+UBOOT_MOVE_ZYNQ_7000=${WRKSRC}/spl/boot.bin
 
 # Overrides for RPI family
 UBOOT_PLIST_RPI=	u-boot.bin
Index: sysutils/u-boot-master/files/patch-scripts_Makefile.spl
===================================================================
--- sysutils/u-boot-master/files/patch-scripts_Makefile.spl
+++ sysutils/u-boot-master/files/patch-scripts_Makefile.spl
@@ -0,0 +1,11 @@
+--- scripts/Makefile.spl.orig	2019-10-10 19:42:42 UTC
++++ scripts/Makefile.spl
+@@ -200,7 +200,7 @@ MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$
+ endif
+ 
+ $(obj)/$(SPL_BIN)-align.bin: $(obj)/$(SPL_BIN).bin
+-	@dd if=$< of=$@ conv=block,sync bs=4 2>/dev/null;
++	@dd if=$< of=$@ conv=sync bs=4 2>/dev/null;
+ 
+ spl/boot.bin: $(obj)/$(SPL_BIN)-align.bin FORCE
+ 	$(call if_changed,mkimage)
Index: sysutils/u-boot-zedboard/Makefile
===================================================================
--- sysutils/u-boot-zedboard/Makefile
+++ sysutils/u-boot-zedboard/Makefile
@@ -2,8 +2,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-BROKEN=		fails to compile
-
 MODEL=		zedboard
 BOARD_CONFIG=	zynq_zed_defconfig
 FAMILY=		zynq_7000
Index: sysutils/u-boot-zedboard/files/uEnv.txt
===================================================================
--- sysutils/u-boot-zedboard/files/uEnv.txt
+++ sysutils/u-boot-zedboard/files/uEnv.txt
@@ -1,4 +0,0 @@
-bootfile=ubldr
-loadaddr=0x02000000
-fdt_file=board.dtb
-uenvcmd=echo Booting FreeBSD from SD Card: ; fatload mmc 0 ${loadaddr} ${bootfile} && bootelf ${loadaddr}
Index: sysutils/u-boot-zybo/Makefile
===================================================================
--- sysutils/u-boot-zybo/Makefile
+++ sysutils/u-boot-zybo/Makefile
@@ -2,8 +2,6 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-BROKEN=		fails to compile
-
 MODEL=		zybo
 BOARD_CONFIG=	zynq_zybo_defconfig
 FAMILY=		zynq_7000
Index: sysutils/u-boot-zybo/files/uEnv.txt
===================================================================
--- sysutils/u-boot-zybo/files/uEnv.txt
+++ sysutils/u-boot-zybo/files/uEnv.txt
@@ -1,4 +0,0 @@
-bootfile=ubldr
-loadaddr=0x02000000
-fdt_file=board.dtb
-uenvcmd=echo Booting FreeBSD from SD Card: ; fatload mmc 0 ${loadaddr} ${bootfile} && bootelf ${loadaddr}
Index: sysutils/u-boot-zybo/pkg-descr
===================================================================
--- sysutils/u-boot-zybo/pkg-descr
+++ sysutils/u-boot-zybo/pkg-descr
@@ -1,6 +1,6 @@
-U-Boot loader for the Xilinx Zynq-based Zedboard.
+U-Boot loader for the Digilent Zynq-based Zybo board.
 
-To install this bootloader, copy the files in the share/u-boot/u-boot-zedboard
+To install this bootloader, copy the files in the share/u-boot/u-boot-zybo
 directory to the first partition, formatted as FAT16 or FAT32, on an SD card.
 
 This version is patched so that: