CVS commit: pkgsrc/sysutils/u-boot-apple-m1

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Mon Aug 30 23:44:39 UTC 2021

Modified Files:
        pkgsrc/sysutils/u-boot-apple-m1: Makefile distinfo

Log Message:
u-boot-apple-m1: update to 2021.04rc3

This update switches the macho bootloader from preloader-m1 to m1n1.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/u-boot-apple-m1/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-apple-m1/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/u-boot-apple-m1/Makefile
diff -u pkgsrc/sysutils/u-boot-apple-m1/Makefile:1.5 pkgsrc/sysutils/u-boot-apple-m1/Makefile:1.6
--- pkgsrc/sysutils/u-boot-apple-m1/Makefile:1.5        Thu Aug 19 07:47:48 2021
+++ pkgsrc/sysutils/u-boot-apple-m1/Makefile    Mon Aug 30 23:44:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/08/19 07:47:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2021/08/30 23:44:39 jmcneill Exp $
 
 UBOOT_TARGET=          apple-m1
 UBOOT_CONFIG=          apple_m1_defconfig
@@ -7,24 +7,37 @@ UBOOT_BIN=            u-boot-nodtb.bin u-boot.mach
 DISTINFO_FILE?=                ${.CURDIR}/../../sysutils/u-boot-apple-m1/distinfo
 PATCHDIR?=             ${.CURDIR}/../../sysutils/u-boot-apple-m1/patches
 
-UBOOT_VERSION= 2021.01
+UBOOT_VERSION=  2021.04rc3
 GITHUB_PROJECT=        u-boot
-GITHUB_TAG=    efe1ec684e2fdaeca38422e5373bdde046ec1f20
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=kettenis/}
+GITHUB_TAG=    8e7191541ca9b4cda9ee191b2728cf29f1660bdd
+MASTER_SITES=   ${MASTER_SITE_GITHUB:=kettenis/}
 DIST_SUBDIR=   ${GITHUB_PROJECT}
 DISTNAME=      u-boot-apple-m1-${GITHUB_TAG}
-EXTRACT_SUFX=  .tar.gz # keep this
+EXTRACT_SUFX=  .tar.gz
 PKGNAME=       u-boot-apple-m1-${UBOOT_VERSION}
 BUILD_TARGET=  u-boot-nodtb.bin
 
-BUILD_DEPENDS+=        preloader-m1>=0:../../sysutils/preloader-m1
-BUILD_DEPENDS+=        dtb-arm64-apple-m1>=0:../../sysutils/dtb-arm64-apple-m1
+USE_TOOLS+=    gzip
+
+BUILD_DEPENDS+=        m1n1>=0:../../sysutils/m1n1
+BUILD_DEPENDS+=        dtc>=0:../../sysutils/dtc
+
+DTS_DIR=       ${WRKSRC}/arch/arm/dts
+DTS_INC=       ${WRKSRC}/include
+DTS_ARCH_INC=  ${DTS_DIR}/include
 
 post-build:
-       ${PREFIX}/bin/machopack ${WRKSRC}/u-boot.macho \
-           ${PREFIX}/share/preloader-m1/preboot.bin@0x803040000 \
-           ${WRKSRC}/u-boot-nodtb.bin@0x803080000 \
-           ${PREFIX}/share/dtb/arm64/apple/apple-m1-j274.dtb@0x803060000
+       cd ${DTS_DIR} && \
+           ${CPP} -P -x assembler-with-cpp -I ${DTS_INC} -I ${DTS_ARCH_INC} \
+           -include ${DTS_DIR}/t8103-j274.dts /dev/null | \
+           ${PREFIX}/bin/dtc -i ${DTS_INC} -i ${DTS_ARCH_INC} -I dts -O dtb \
+              -p 1024 -b 0 -o ${WRKDIR}/t8103-j274.dtb
+       cp ${WRKSRC}/u-boot-nodtb.bin ${WRKDIR}
+       rm -f ${WRKDIR}/u-boot-nodtb.bin.gz && gzip ${WRKDIR}/u-boot-nodtb.bin
+       cat ${PREFIX}/share/m1n1/m1n1.macho \
+           ${WRKDIR}/u-boot-nodtb.bin.gz \
+           ${WRKDIR}/t8103-j274.dtb \
+           > ${WRKSRC}/u-boot.macho
 
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/u-boot-apple-m1/distinfo
diff -u pkgsrc/sysutils/u-boot-apple-m1/distinfo:1.1 pkgsrc/sysutils/u-boot-apple-m1/distinfo:1.2
--- pkgsrc/sysutils/u-boot-apple-m1/distinfo:1.1        Sat Mar  6 20:17:39 2021
+++ pkgsrc/sysutils/u-boot-apple-m1/distinfo    Mon Aug 30 23:44:39 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2021/03/06 20:17:39 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2021/08/30 23:44:39 jmcneill Exp $
 
-SHA1 (u-boot/u-boot-apple-m1-efe1ec684e2fdaeca38422e5373bdde046ec1f20-efe1ec684e2fdaeca38422e5373bdde046ec1f20.tar.gz) = eabc89f7cf3ae680b696a3e93edf5b2fca0a9dbb
-RMD160 (u-boot/u-boot-apple-m1-efe1ec684e2fdaeca38422e5373bdde046ec1f20-efe1ec684e2fdaeca38422e5373bdde046ec1f20.tar.gz) = 81c08e23b81f90fae3551e2b3613029e615c9b29
-SHA512 (u-boot/u-boot-apple-m1-efe1ec684e2fdaeca38422e5373bdde046ec1f20-efe1ec684e2fdaeca38422e5373bdde046ec1f20.tar.gz) = 
0ab1a5b6f86f159b57e38aaa5698177b05c126d016fc24ee90ca25de85424b68de8aa3007bb1fe85e5f32cb2a67e0853c7fbc2001b21161dce5e9a732a4096d3
-Size (u-boot/u-boot-apple-m1-efe1ec684e2fdaeca38422e5373bdde046ec1f20-efe1ec684e2fdaeca38422e5373bdde046ec1f20.tar.gz) = 21202914 bytes
+SHA1 (u-boot/u-boot-apple-m1-8e7191541ca9b4cda9ee191b2728cf29f1660bdd-8e7191541ca9b4cda9ee191b2728cf29f1660bdd.tar.gz) = 7eaa9c3610faafa695040f60708f478dae63ccf9
+RMD160 (u-boot/u-boot-apple-m1-8e7191541ca9b4cda9ee191b2728cf29f1660bdd-8e7191541ca9b4cda9ee191b2728cf29f1660bdd.tar.gz) = 28db81df99ff76504eda96d1dff3b931fc1f2123
+SHA512 (u-boot/u-boot-apple-m1-8e7191541ca9b4cda9ee191b2728cf29f1660bdd-8e7191541ca9b4cda9ee191b2728cf29f1660bdd.tar.gz) = 
8e26ababbf512cdd7e2653f65b7b6497270ddfb81e322f958a1f535c1c70c8a82131ffb27aa423a0a2d0dc26988f7b9a7ad35130c7c1dae863677bdf47ac5a87
+Size (u-boot/u-boot-apple-m1-8e7191541ca9b4cda9ee191b2728cf29f1660bdd-8e7191541ca9b4cda9ee191b2728cf29f1660bdd.tar.gz) = 21276309 bytes