From 3ba503d43924cccf88e821ffe12c0948353be320 Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Tue, 24 Nov 2020 20:15:58 +0000
Subject: [PATCH] sysutils/u-boot-pine-h64: Add new port

U-boot variant for the Pine64 H64 board.
---
 sysutils/Makefile                  |  1 +
 sysutils/u-boot-master/Makefile    |  5 +++++
 sysutils/u-boot-pine-h64/Makefile  | 10 ++++++++++
 sysutils/u-boot-pine-h64/pkg-descr |  9 +++++++++
 4 files changed, 25 insertions(+)
 create mode 100644 sysutils/u-boot-pine-h64/Makefile
 create mode 100644 sysutils/u-boot-pine-h64/pkg-descr

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 6dc454c51e82..bcc9380636a8 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1379,6 +1379,7 @@
     SUBDIR += u-boot-orangepi-zero
     SUBDIR += u-boot-pandaboard
     SUBDIR += u-boot-pcduino3
+    SUBDIR += u-boot-pine-h64
     SUBDIR += u-boot-pine64
     SUBDIR += u-boot-pine64-lts
     SUBDIR += u-boot-pinebook
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index e518ec6a4afd..2bba7b5aa212 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -151,9 +151,14 @@ UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}}
 
 # Per family dependancies
 .if defined(FAMILY) && ${FAMILY} == allwinner64
+.if defined(SUBFAMILY) && ${SUBFAMILY} == h6
+BUILD_DEPENDS+=	${LOCALBASE}/share/atf-sun50i_h6/bl31.bin:sysutils/atf-sun50i_h6
+MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-sun50i_h6/bl31.bin
+.else
 BUILD_DEPENDS+=	${LOCALBASE}/share/atf-sun50i_a64/bl31.bin:sysutils/atf-sun50i_a64
 MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-sun50i_a64/bl31.bin
 .endif
+.endif
 
 .if defined(FAMILY) && ${FAMILY} == rk3328
 BUILD_DEPENDS+=	${LOCALBASE}/share/atf-rk3328/bl31.elf:sysutils/atf-rk3328 \
diff --git a/sysutils/u-boot-pine-h64/Makefile b/sysutils/u-boot-pine-h64/Makefile
new file mode 100644
index 000000000000..875ad4fea99d
--- /dev/null
+++ b/sysutils/u-boot-pine-h64/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../u-boot-master
+
+MODEL=		pine-h64
+BOARD_CONFIG=	pine_h64_defconfig
+FAMILY=		allwinner64
+SUBFAMILY=	h6
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-pine-h64/pkg-descr b/sysutils/u-boot-pine-h64/pkg-descr
new file mode 100644
index 000000000000..82d6ecaaad27
--- /dev/null
+++ b/sysutils/u-boot-pine-h64/pkg-descr
@@ -0,0 +1,9 @@
+U-Boot loader and related files for the Pine H64
+
+To install this bootloader on an sdcard just do:
+dd if=/usr/local/share/u-boot/u-boot-pine-h64/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=128k seek=1 conv=sync
+
+For information about running FreeBSD on Allwinner boards, see
+ https://wiki.freebsd.org/FreeBSD/arm/Allwinner
+
+WWW: https://www.denx.de/wiki/U-Boot