From e87c48fdd100ce18deb70457176480710163e049 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Tue, 1 Mar 2022 20:57:13 -0600
Subject: [PATCH 2/2] sysutils/u-boot-apple-m1: add

Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
---
 sysutils/Makefile                          |  1 +
 sysutils/u-boot-apple-m1/Makefile          | 29 ++++++++++++++++++++++
 sysutils/u-boot-apple-m1/files/m1_fragment |  1 +
 sysutils/u-boot-apple-m1/pkg-descr         |  3 +++
 sysutils/u-boot-master/Makefile            |  8 ++++--
 sysutils/u-boot-master/distinfo            | 18 +++-----------
 6 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 sysutils/u-boot-apple-m1/Makefile
 create mode 100644 sysutils/u-boot-apple-m1/files/m1_fragment
 create mode 100644 sysutils/u-boot-apple-m1/pkg-descr

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 794d73bd98e0..953a2f02df2b 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1401,6 +1401,7 @@
     SUBDIR += tzdialog
     SUBDIR += u-boot-a13-olinuxino
     SUBDIR += u-boot-a64-olinuxino
+    SUBDIR += u-boot-apple-m1
     SUBDIR += u-boot-bananapi
     SUBDIR += u-boot-bananapim2
     SUBDIR += u-boot-beaglebone
diff --git a/sysutils/u-boot-apple-m1/Makefile b/sysutils/u-boot-apple-m1/Makefile
new file mode 100644
index 000000000000..19cdad16a1c4
--- /dev/null
+++ b/sysutils/u-boot-apple-m1/Makefile
@@ -0,0 +1,29 @@
+MASTERDIR=	${.CURDIR}/../u-boot-master
+
+MODEL=		apple-m1
+BOARD_CONFIG=	apple_m1_defconfig
+FAMILY=		apple
+
+PATCHDIR=
+
+CONFIG_FRAGMENT=	${.CURDIR}/files/m1_fragment
+FRAGMENT_NAME=	m1_fragment
+
+# j274 = M1 Mac Mini, j293 = M1 Macbook Pro
+APPLE_VARIANTS=	t8103-j274 \
+				t8103-j293
+APPLE_FW=	${LOCALBASE}/share/m1n1/m1n1.bin
+BUILD_DEPENDS+=	${APPLE_FW}:sysutils/m1n1
+
+UBOOT_PLIST=	u-boot-nodtb.bin
+.for avar in ${APPLE_VARIANTS}
+UBOOT_PLIST+=	u-boot-${avar}.bin
+.endfor
+
+post-build:
+.for avar in ${APPLE_VARIANTS}
+	cat ${APPLE_FW} ${WRKSRC}/arch/arm/dts/${avar}.dtb \
+	    ${WRKSRC}/u-boot-nodtb.bin > ${WRKSRC}/u-boot-${avar}.bin
+.endfor
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-apple-m1/files/m1_fragment b/sysutils/u-boot-apple-m1/files/m1_fragment
new file mode 100644
index 000000000000..6522de662d85
--- /dev/null
+++ b/sysutils/u-boot-apple-m1/files/m1_fragment
@@ -0,0 +1 @@
+CONFIG_ARM64_CRC32=n
diff --git a/sysutils/u-boot-apple-m1/pkg-descr b/sysutils/u-boot-apple-m1/pkg-descr
new file mode 100644
index 000000000000..631594a5f78c
--- /dev/null
+++ b/sysutils/u-boot-apple-m1/pkg-descr
@@ -0,0 +1,3 @@
+U-Boot loader and related files for the Apple M1 family
+
+For general information about U-Boot see WWW: https://www.denx.de/wiki/U-Boot
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index 48442f118c54..1ad2625bb53c 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -75,6 +75,10 @@ UBOOT_METADATA_ALLWINNER64_METHOD=	raw
 UBOOT_METADATA_ALLWINNER64_RAW_OFFSET=	1
 UBOOT_METADATA_ALLWINNER64_RAW_BS=	128k
 
+# Overrides for Apple family
+UBOOT_ARCH_APPLE=	aarch64
+UBOOT_VERSION_APPLE=	2022.01
+
 # 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
@@ -222,10 +226,10 @@ CONFIG_FRAGMENT=	${FILESDIR}/${FRAGMENT_NAME}
 .if defined(CONFIG_FRAGMENT)
 do-configure:
 	${CP} ${CONFIG_FRAGMENT} ${WRKSRC}/configs/
-	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME})
+	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ARGS} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME})
 .else
 do-configure:
-	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
+	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG} ${MAKE_ARGS})
 .endif
 
 post-build:
diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo
index 77609bffddd3..854cf5cda75d 100644
--- a/sysutils/u-boot-master/distinfo
+++ b/sysutils/u-boot-master/distinfo
@@ -1,15 +1,3 @@
-TIMESTAMP = 1636485856
-SHA256 (u-boot/u-boot-2021.07.tar.bz2) = 312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e
-SIZE (u-boot/u-boot-2021.07.tar.bz2) = 17275746
-SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
-SIZE (u-boot/939129/raw) = 310
-SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7
-SIZE (u-boot/1036621/raw) = 480
-SHA256 (u-boot/1173473/raw) = 4f182d6f99b1d868237607200d64a1d8a2d57ea44fc25ca49bce929ad6457228
-SIZE (u-boot/1173473/raw) = 433
-SHA256 (u-boot/1172554/raw) = d1a39d7d6487cfb481392e7ea4f0bf0d209c08e0c3426c29d7eeaeb9b806cf42
-SIZE (u-boot/1172554/raw) = 640
-SHA256 (u-boot/1172555/raw) = 09d17a62fb6bc7c7ab73bfc7061fc5da2b5a32e7deb098c9f76aed8ff8991751
-SIZE (u-boot/1172555/raw) = 568
-SHA256 (u-boot/1547145/raw) = 50c6280a5db419597de451be3e89a8660c9f913767af205a4add79a8db6b89ce
-SIZE (u-boot/1547145/raw) = 372
+TIMESTAMP = 1644991717
+SHA256 (u-boot/u-boot-2022.01.tar.bz2) = 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413
+SIZE (u-boot/u-boot-2022.01.tar.bz2) = 17449627
-- 
2.33.0