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

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

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Fri Sep  3 20:50:01 UTC 2021

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

Log Message:
Build separate u-boot-<board>.macho files for Mac mini and Macbook Pro.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/u-boot-apple-m1/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-apple-m1/PLIST
cvs rdiff -u -r1.2 -r1.3 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.6 pkgsrc/sysutils/u-boot-apple-m1/Makefile:1.7
--- pkgsrc/sysutils/u-boot-apple-m1/Makefile:1.6        Mon Aug 30 23:44:39 2021
+++ pkgsrc/sysutils/u-boot-apple-m1/Makefile    Fri Sep  3 20:50:00 2021
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2021/08/30 23:44:39 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2021/09/03 20:50:00 jmcneill Exp $
+
+PKGREVISION=           1
 
 UBOOT_TARGET=          apple-m1
 UBOOT_CONFIG=          apple_m1_defconfig
-UBOOT_BIN=             u-boot-nodtb.bin u-boot.macho
+UBOOT_BIN=             u-boot-nodtb.bin
 
 DISTINFO_FILE?=                ${.CURDIR}/../../sysutils/u-boot-apple-m1/distinfo
 PATCHDIR?=             ${.CURDIR}/../../sysutils/u-boot-apple-m1/patches
 
 UBOOT_VERSION=  2021.04rc3
 GITHUB_PROJECT=        u-boot
-GITHUB_TAG=    8e7191541ca9b4cda9ee191b2728cf29f1660bdd
+GITHUB_TAG=    c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d
 MASTER_SITES=   ${MASTER_SITE_GITHUB:=kettenis/}
 DIST_SUBDIR=   ${GITHUB_PROJECT}
 DISTNAME=      u-boot-apple-m1-${GITHUB_TAG}
@@ -26,18 +28,27 @@ DTS_DIR=    ${WRKSRC}/arch/arm/dts
 DTS_INC=       ${WRKSRC}/include
 DTS_ARCH_INC=  ${DTS_DIR}/include
 
+DTS_BOARDS=    t8103-j274 \
+               t8103-j293
+
+.for board in ${DTS_BOARDS}
+UBOOT_BIN+=    u-boot-${board}.macho
+.endfor
+
 post-build:
+       cp ${WRKSRC}/u-boot-nodtb.bin ${WRKDIR}
+       rm -f ${WRKDIR}/u-boot-nodtb.bin.gz && gzip ${WRKDIR}/u-boot-nodtb.bin
+.for board in ${DTS_BOARDS}
        cd ${DTS_DIR} && \
            ${CPP} -P -x assembler-with-cpp -I ${DTS_INC} -I ${DTS_ARCH_INC} \
-           -include ${DTS_DIR}/t8103-j274.dts /dev/null | \
+           -include ${DTS_DIR}/${board}.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
+              -p 1024 -b 0 -o ${WRKDIR}/${board}.dtb
        cat ${PREFIX}/share/m1n1/m1n1.macho \
            ${WRKDIR}/u-boot-nodtb.bin.gz \
-           ${WRKDIR}/t8103-j274.dtb \
-           > ${WRKSRC}/u-boot.macho
+           ${WRKDIR}/${board}.dtb \
+           > ${WRKSRC}/u-boot-${board}.macho
+.endfor
 
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/u-boot-apple-m1/PLIST
diff -u pkgsrc/sysutils/u-boot-apple-m1/PLIST:1.1 pkgsrc/sysutils/u-boot-apple-m1/PLIST:1.2
--- pkgsrc/sysutils/u-boot-apple-m1/PLIST:1.1   Sat Mar  6 20:17:39 2021
+++ pkgsrc/sysutils/u-boot-apple-m1/PLIST       Fri Sep  3 20:50:00 2021
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/03/06 20:17:39 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/09/03 20:50:00 jmcneill Exp $
 share/u-boot/apple-m1/u-boot-nodtb.bin
-share/u-boot/apple-m1/u-boot.macho
+share/u-boot/apple-m1/u-boot-t8103-j274.macho
+share/u-boot/apple-m1/u-boot-t8103-j293.macho

Index: pkgsrc/sysutils/u-boot-apple-m1/distinfo
diff -u pkgsrc/sysutils/u-boot-apple-m1/distinfo:1.2 pkgsrc/sysutils/u-boot-apple-m1/distinfo:1.3
--- pkgsrc/sysutils/u-boot-apple-m1/distinfo:1.2        Mon Aug 30 23:44:39 2021
+++ pkgsrc/sysutils/u-boot-apple-m1/distinfo    Fri Sep  3 20:50:00 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2021/08/30 23:44:39 jmcneill Exp $
+$NetBSD: distinfo,v 1.3 2021/09/03 20:50:00 jmcneill Exp $
 
-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
+SHA1 (u-boot/u-boot-apple-m1-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d.tar.gz) = 604308d2190518585ef650f69a4a1d7c69dfc369
+RMD160 (u-boot/u-boot-apple-m1-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d.tar.gz) = 136f34807a3f1ee0b1d6d882aee46a434cf220ac
+SHA512 (u-boot/u-boot-apple-m1-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d.tar.gz) = 
2aacd1c6be21f91e735e359bf41ce3ffafd0c0ad496a893d7c911dce4eba9bbda1e17caf8bf260cdb965182b1d51beb46562cb42d5860ff48e3c4295b1ff0c3d
+Size (u-boot/u-boot-apple-m1-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d.tar.gz) = 21276320 bytes