Index: head/sysutils/u-boot-chip/Makefile
===================================================================
--- head/sysutils/u-boot-chip/Makefile	(revision 447119)
+++ head/sysutils/u-boot-chip/Makefile	(revision 447120)
@@ -1,14 +1,10 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-chip
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-COMMENT=	Cross-build U-Boot loader for NextThingCo CHIP
-
-LICENSE=	GPLv2
-
-MASTERDIR=	${.CURDIR}/../u-boot-olimex-a20-som-evb
-DESCR=		${.CURDIR}/pkg-descr
-MODEL=		sun5i-r8-chip
+MODEL=		chip
 BOARD_CONFIG=	CHIP_defconfig
+FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-chip/pkg-descr
===================================================================
--- head/sysutils/u-boot-chip/pkg-descr	(revision 447119)
+++ head/sysutils/u-boot-chip/pkg-descr	(revision 447120)
@@ -1,19 +1,16 @@
 U-Boot loader for NextThingCo CHIP.
 
 To install this bootloader on an sdcard just do :
 dd if=/usr/local/share/u-boot/u-boot-chip/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=notrunc,sync
 
 This version is patched so that:
  * ELF and API features are enabled.
- * The default environment is trimmed to just what's needed to boot.
- * The saveenv command writes to the file u-boot.env on the FAT partition.
- * The DTB file name is chosen based on the board model and passed to ubldr.bin
-   using the fdtfile env variable. ubldr.bin loads the DTB from /boot/dtb/ on
-   the FreeBSD partition.
- * By default, it loads PIE ubldr.bin from file ubldr.bin on the FAT partition
-   to address 0x42000000, and launches it.
+ * The distroboot command knows how to load FreeBSD loader(8)
+ * By default, it loads ubldr.bin (PIE) from file ubldr.bin on the FAT
+   partition to address 0x42000000, and launches it. If ubldr.bin is
+   not found, it falls back on ubldr
 
 For information about running FreeBSD on Allwinner boards, see
  https://wiki.freebsd.org/FreeBSD/arm/Allwinner
 
 For general information about U-Boot see WWW: http://www.denx.de/wiki/U-Boot