Index: head/sysutils/u-boot-a13-olinuxino/Makefile
===================================================================
--- head/sysutils/u-boot-a13-olinuxino/Makefile	(revision 431326)
+++ head/sysutils/u-boot-a13-olinuxino/Makefile	(revision 431327)
@@ -1,14 +1,10 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-a13-olinuxino
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-COMMENT=	Cross-build U-Boot loader for A13 Olinuxino
-
-LICENSE=	GPLv2
-
-MASTERDIR=	${.CURDIR}/../u-boot-olimex-a20-som-evb
-DESCR=		${.CURDIR}/pkg-descr
 MODEL=		sun5i-a13-olinuxino
 BOARD_CONFIG=	A13-OLinuXino_defconfig
+FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-bananapi/Makefile
===================================================================
--- head/sysutils/u-boot-bananapi/Makefile	(revision 431326)
+++ head/sysutils/u-boot-bananapi/Makefile	(revision 431327)
@@ -1,15 +1,10 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-bananapi
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-COMMENT=	Cross-build U-Boot loader for Banana Pi
-
-LICENSE=	GPLv2
-
-# Local overrides
-MASTERDIR=	${.CURDIR}/../u-boot-cubieboard
-DESCR=		${.CURDIR}/pkg-descr
 MODEL=		bananapi
-CONF_TARGET=	Bananapi_defconfig
+BOARD_CONFIG=	Bananapi_defconfig
+FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-bananapim2/Makefile
===================================================================
--- head/sysutils/u-boot-bananapim2/Makefile	(revision 431326)
+++ head/sysutils/u-boot-bananapim2/Makefile	(revision 431327)
@@ -1,14 +1,10 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-${MODEL}
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-COMMENT=	Cross-build U-Boot loader for bananapi M2
-
-LICENSE=	GPLv2
-
-MASTERDIR=	${.CURDIR}/../u-boot-olimex-a20-som-evb
-DESCR=		${.CURDIR}/pkg-descr
 MODEL=		bananapim2
 BOARD_CONFIG=	Sinovoip_BPI_M2_defconfig
+FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-cubieboard/Makefile
===================================================================
--- head/sysutils/u-boot-cubieboard/Makefile	(revision 431326)
+++ head/sysutils/u-boot-cubieboard/Makefile	(revision 431327)
@@ -1,51 +1,10 @@
 # $FreeBSD$
 
-PORTNAME=	u-boot
-PORTVERSION=	2015.04
-CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/
-PKGNAMESUFFIX?=	-cubieboard
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-MAINTAINER=	loos@FreeBSD.org
-COMMENT?=	Cross-build U-Boot loader for Cubieboard
+MODEL=		cubieboard
+BOARD_CONFIG=	Cubieboard_defconfig
+FAMILY=		allwinner
 
-LICENSE=	GPLv2
-
-BUILD_DEPENDS=	arm-none-eabi-gcc:devel/arm-none-eabi-gcc
-
-MODEL?=		cubieboard
-CONF_TARGET?=	Cubieboard_defconfig
-
-NO_ARCH=	yes
-
-WRKSRC=		${WRKDIR}/u-boot-${DISTVERSION}
-USES=		gmake tar:bzip2
-SSP_UNSAFE=	yes # cross-LD does not support -fstack-protector
-
-U_BOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
-PLIST_FILES=	${U_BOOT_DIR}/u-boot.img \
-		${U_BOOT_DIR}/u-boot-sunxi-with-spl.bin \
-		${U_BOOT_DIR}/sunxi-spl.bin \
-		${U_BOOT_DIR}/README
-
-MAKE_ARGS+=	ARCH=arm \
-		CROSS_COMPILE=arm-none-eabi-
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%MODEL%%,${MODEL}," \
-		${WRKSRC}/include/configs/sunxi-common.h
-	@${LN} -sf compiler-gcc5.h ${WRKSRC}/include/linux/compiler-gcc6.h
-
-do-configure:
-	(cd ${WRKSRC}; ${MAKE_CMD} ${CONF_TARGET})
-
-do-install:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}
-	${INSTALL_DATA} ${WRKSRC}/spl/sunxi-spl.bin \
-		${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}
-	${INSTALL_DATA} ${WRKSRC}/u-boot-sunxi-with-spl.bin \
-		${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}
-	${INSTALL_DATA} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}
-	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-cubieboard2/Makefile
===================================================================
--- head/sysutils/u-boot-cubieboard2/Makefile	(revision 431326)
+++ head/sysutils/u-boot-cubieboard2/Makefile	(revision 431327)
@@ -1,15 +1,10 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-cubieboard2
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-COMMENT=	Cross-build U-Boot loader for Cubieboard2
-
-LICENSE=	GPLv2
-
-# Local overrides
-MASTERDIR=	${.CURDIR}/../u-boot-cubieboard
-DESCR=		${.CURDIR}/pkg-descr
 MODEL=		cubieboard2
-CONF_TARGET=	Cubieboard2_defconfig
+BOARD_CONFIG=	Cubieboard2_defconfig
+FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-master/Makefile
===================================================================
--- head/sysutils/u-boot-master/Makefile	(revision 431326)
+++ head/sysutils/u-boot-master/Makefile	(revision 431327)
@@ -1,81 +1,89 @@
 # $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=	arm-none-eabi-gcc:devel/arm-none-eabi-gcc
+BUILD_DEPENDS=	arm-none-eabi-gcc:devel/arm-none-eabi-gcc \
+		gsed:textproc/gsed \
+		swig3.0:devel/swig30 \
+		python:lang/python2 \
+		${PREFIX}/bin/dtc:sysutil/dtc
 
 USES=		gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bsdimp
 GH_PROJECT=	u-boot
 
 SSP_UNSAFE=	yes
 UBOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
 INST=		${PREFIX}/${UBOOT_DIR}
 DESCR?=		${.CURDIR}/pkg-descr
 
-MAKE_ARGS+=	ARCH=${UBOOT_ARCH} CROSS_COMPILE=${UBOOT_ARCH}-none-eabi-
+MAKE_ARGS+=	V=1 ARCH=${UBOOT_ARCH} CROSS_COMPILE=${UBOOT_ARCH}-none-eabi-
 
 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
 
 # Defines for OMAP family
 UBOOT_PLIST_OMAP=u-boot.img MLO
 UBOOT_VERSION_OMAP=2017.01
+
+# Defines for ALLWINNER family
+UBOOT_PLIST_ALLWINNER=u-boot.img u-boot-sunxi-with-spl.bin
+UBOOT_VERSION_ALLWINNER=2017.01
 
 # Uboot variables
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
 .endif
 UBOOT_VERSION?=	2017.01
 
 .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
 
 # 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})
 
 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-olimex-a20-som-evb/Makefile
===================================================================
--- head/sysutils/u-boot-olimex-a20-som-evb/Makefile	(revision 431326)
+++ head/sysutils/u-boot-olimex-a20-som-evb/Makefile	(revision 431327)
@@ -1,51 +1,10 @@
 # $FreeBSD$
 
-PORTNAME=	u-boot
-PORTVERSION=	${UBOOT_VERSION}
-CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/
-PKGNAMESUFFIX?=	-${MODEL}
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-MAINTAINER=	manu@FreeBSD.org
-COMMENT=	Cross-build U-Boot loader for olimex-a20-som-evb
+MODEL=		olimex-a20-som-evb
+BOARD_CONFIG=	A20-Olimex-SOM-EVB_defconfig
+FAMILY=		allwinner
 
-LICENSE=	GPLv2
-
-BUILD_DEPENDS=	arm-none-eabi-gcc:devel/arm-none-eabi-gcc
-
-UBOOT_VERSION?=	2016.09
-BOARD_CONFIG?=	A20-Olimex-SOM-EVB_defconfig
-MODEL?=		olimex-a20-som-evb
-
-NO_ARCH=	yes
-
-WRKSRC=		${WRKDIR}/u-boot-${DISTVERSION}
-USES=		gmake tar:bzip2
-SSP_UNSAFE=	yes # cross-LD does not support -fstack-protector
-
-U_BOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
-PLIST_FILES=	${U_BOOT_DIR}/u-boot.img \
-		${U_BOOT_DIR}/u-boot-sunxi-with-spl.bin \
-		${U_BOOT_DIR}/sunxi-spl.bin \
-		${U_BOOT_DIR}/README
-
-MAKE_ARGS+=	ARCH=arm \
-		CROSS_COMPILE=arm-none-eabi-
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%MODEL%%,${MODEL}," \
-		${WRKSRC}/include/configs/sunxi-common.h
-
-do-configure:
-	(cd ${WRKSRC}; ${MAKE_CMD} ${BOARD_CONFIG})
-
-do-install:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}
-	${INSTALL_DATA} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}
-	${INSTALL_DATA} ${WRKSRC}/u-boot-sunxi-with-spl.bin \
-		${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}
-	${INSTALL_DATA} ${WRKSRC}/spl/sunxi-spl.bin \
-		${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}
-	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-olinuxino-lime/Makefile
===================================================================
--- head/sysutils/u-boot-olinuxino-lime/Makefile	(revision 431326)
+++ head/sysutils/u-boot-olinuxino-lime/Makefile	(revision 431327)
@@ -1,14 +1,10 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-${MODEL}
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-COMMENT=	Cross-build U-Boot loader for Olinuxino Lime
-
-LICENSE=	GPLv2
-
-MASTERDIR=	${.CURDIR}/../u-boot-olimex-a20-som-evb
-DESCR=		${.CURDIR}/pkg-descr
 MODEL=		olinuxino-lime
 BOARD_CONFIG=	A10-OLinuXino-Lime_defconfig
+FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-orangepi-one/Makefile
===================================================================
--- head/sysutils/u-boot-orangepi-one/Makefile	(revision 431326)
+++ head/sysutils/u-boot-orangepi-one/Makefile	(revision 431327)
@@ -1,14 +1,10 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-${MODEL}
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-COMMENT=	Cross-build U-Boot loader for OrangePi One
-
-LICENSE=	GPLv2
-
-MASTERDIR=	${.CURDIR}/../u-boot-olimex-a20-som-evb
-DESCR=		${.CURDIR}/pkg-descr
 MODEL=		orangepi-one
 BOARD_CONFIG=	orangepi_one_defconfig
+FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-pcduino3/Makefile
===================================================================
--- head/sysutils/u-boot-pcduino3/Makefile	(revision 431326)
+++ head/sysutils/u-boot-pcduino3/Makefile	(revision 431327)
@@ -1,14 +1,10 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-${MODEL}
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-COMMENT=	Cross-build U-Boot loader for Linksprite pcDuino3
-
-LICENSE=	GPLv2
-
-MASTERDIR=	${.CURDIR}/../u-boot-olimex-a20-som-evb
-DESCR=		${.CURDIR}/pkg-descr
 MODEL=		pcduino3
 BOARD_CONFIG=	Linksprite_pcDuino3_defconfig
+FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"