Index: head/sysutils/u-boot-master/Makefile
===================================================================
--- head/sysutils/u-boot-master/Makefile	(revision 447311)
+++ head/sysutils/u-boot-master/Makefile	(revision 447312)
@@ -1,104 +1,119 @@
 # $FreeBSD$
 #
 # Common infrastructure for u-boot ports
 #
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
 DISTVERSIONPREFIX= ports-v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
 
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	Cross-build das u-boot for ${MODEL}
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS+=	gsed:textproc/gsed \
 		swig:devel/swig13 \
 		dtc>=1.4.1:sysutils/dtc
 BUILD_DEPENDS+=	${COMPILER}:devel/${COMPILER}
 
 USES=		gmake python:build shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	u-boot
 
 SHEBANG_FILES=	lib/libfdt/pylibfdt/setup.py
 SSP_UNSAFE=	yes
 UBOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
 INST=		${PREFIX}/${UBOOT_DIR}
 DESCR?=		${.CURDIR}/pkg-descr
 
 MAKE_ARGS+=	V=1 CROSS_COMPILE=${CROSS_COMPILE} DTC=${LOCALBASE}/bin/dtc ${ARCHFLAGS}
 
 NO_ARCH=	yes
 
 # Sanity checks
 .if !defined(MODEL)
 IGNORE+=	MODEL is not defined
 .endif
 .if !defined(BOARD_CONFIG)
 IGNORE+=	BOARD_CONFIG is not defined
 .endif
 .if !defined(FAMILY)
 IGNORE+=	FAMILY is not defined
 .endif
 
 # Overrides for OMAP family
 UBOOT_PLIST_OMAP=u-boot.img MLO
 
 # Overrides for ALLWINNER family
 UBOOT_PLIST_ALLWINNER=u-boot.img u-boot-sunxi-with-spl.bin
 
 # Overrides for ALLWINNER64 family
 UBOOT_PLIST_ALLWINNER64=u-boot-sunxi-with-spl.bin
 UBOOT_ARCH_ALLWINNER64=aarch64
 
+# 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 variables
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
 .endif
 UBOOT_VERSION?=	2017.07.00.1
 
 .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu})
 UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}}
 .endif
 UBOOT_PLIST?=u-boot.img
 
 .if !defined(UBOOT_ARCH) && defined(UBOOT_ARCH_${FAMILY:tu})
 UBOOT_ARCH=${UBOOT_ARCH_${FAMILY:tu}}
 .endif
 UBOOT_ARCH?=	arm
 
 .if ${UBOOT_ARCH} == arm
 CROSS_COMPILE=arm-none-eabi-
 ARCHFLAGS=ARCH=${UBOOT_ARCH}
 .elif ${UBOOT_ARCH} == aarch64
 CROSS_COMPILE=aarch64-none-elf-
 ARCHFLAGS=ARCH=arm
 .else
 # Best guess for other architectures
 CROSS_COMPILE=${UBOOT_ARCH}-none-elf-
 ARCHFLAGS=ARCH=${UBOOT_ARCH}
 .endif
 COMPILER?=${CROSS_COMPILE}gcc
 
+.if !defined(UBOOT_MOVE) && defined(UBOOT_MOVE_${FAMILY:tu})
+UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}}
+.endif
+
 # Each u-boot family has different files to include, bring them in.
 .for i in ${UBOOT_PLIST}
 PLIST_FILES+= ${UBOOT_DIR}/${i}
 .endfor
 PLIST_FILES+= ${UBOOT_DIR}/README
 
 do-configure:
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
+
+# If we need to put anything into WRKSRC, do so now so we can build the PLIST
+# in do-install
+.if defined(UBOOT_MOVE)
+pre-install:
+	${CP} ${UBOOT_MOVE} ${WRKSRC}
+.endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${INST}
 .for i in ${UBOOT_PLIST}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${INST}
 .endfor
 	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README
 
 .include <bsd.port.mk>
Index: head/sysutils/u-boot-zedboard/files/uEnv.txt
===================================================================
--- head/sysutils/u-boot-zedboard/files/uEnv.txt	(nonexistent)
+++ head/sysutils/u-boot-zedboard/files/uEnv.txt	(revision 447312)
@@ -0,0 +1,4 @@
+bootfile=ubldr
+loadaddr=0x02000000
+fdt_file=board.dtb
+uenvcmd=echo Booting FreeBSD from SD Card: ; fatload mmc 0 ${loadaddr} ${bootfile} && bootelf ${loadaddr}

Property changes on: head/sysutils/u-boot-zedboard/files/uEnv.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/u-boot-zedboard/pkg-descr
===================================================================
--- head/sysutils/u-boot-zedboard/pkg-descr	(nonexistent)
+++ head/sysutils/u-boot-zedboard/pkg-descr	(revision 447312)
@@ -0,0 +1,12 @@
+U-Boot loader for the Xilinx Zynq-based Zedboard.
+
+To install this bootloader, copy the files in the share/u-boot/u-boot-zedboard
+directory to the first partition, formatted as FAT16 or FAT32, on an SD card.
+
+This version is patched as follows:
+ * ELF and API features are enabled.
+
+For information about running FreeBSD on Xilinx Zynq SoCs, see
+WWW: http://wiki.freebsd.org/FreeBSD/arm/Zedboard
+
+For general information about U-Boot see WWW: http://www.denx.de/wiki/U-Boot

Property changes on: head/sysutils/u-boot-zedboard/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property