Fri Sep 3 20:50:01 2021 UTC ()
Build separate u-boot-<board>.macho files for Mac mini and Macbook Pro.


(jmcneill)
diff -r1.6 -r1.7 pkgsrc/sysutils/u-boot-apple-m1/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-apple-m1/PLIST
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-apple-m1/distinfo
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/u-boot-apple-m1/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-apple-m1/Makefile 2021/08/30 23:44:39 1.6
+++ pkgsrc/sysutils/u-boot-apple-m1/Makefile 2021/09/03 20:50:00 1.7
@@ -1,43 +1,54 @@ @@ -1,43 +1,54 @@
1# $NetBSD: Makefile,v 1.6 2021/08/30 23:44:39 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.7 2021/09/03 20:50:00 jmcneill Exp $
 2
 3PKGREVISION= 1
2 4
3UBOOT_TARGET= apple-m1 5UBOOT_TARGET= apple-m1
4UBOOT_CONFIG= apple_m1_defconfig 6UBOOT_CONFIG= apple_m1_defconfig
5UBOOT_BIN= u-boot-nodtb.bin u-boot.macho 7UBOOT_BIN= u-boot-nodtb.bin
6 8
7DISTINFO_FILE?= ${.CURDIR}/../../sysutils/u-boot-apple-m1/distinfo 9DISTINFO_FILE?= ${.CURDIR}/../../sysutils/u-boot-apple-m1/distinfo
8PATCHDIR?= ${.CURDIR}/../../sysutils/u-boot-apple-m1/patches 10PATCHDIR?= ${.CURDIR}/../../sysutils/u-boot-apple-m1/patches
9 11
10UBOOT_VERSION= 2021.04rc3 12UBOOT_VERSION= 2021.04rc3
11GITHUB_PROJECT= u-boot 13GITHUB_PROJECT= u-boot
12GITHUB_TAG= 8e7191541ca9b4cda9ee191b2728cf29f1660bdd 14GITHUB_TAG= c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d
13MASTER_SITES= ${MASTER_SITE_GITHUB:=kettenis/} 15MASTER_SITES= ${MASTER_SITE_GITHUB:=kettenis/}
14DIST_SUBDIR= ${GITHUB_PROJECT} 16DIST_SUBDIR= ${GITHUB_PROJECT}
15DISTNAME= u-boot-apple-m1-${GITHUB_TAG} 17DISTNAME= u-boot-apple-m1-${GITHUB_TAG}
16EXTRACT_SUFX= .tar.gz 18EXTRACT_SUFX= .tar.gz
17PKGNAME= u-boot-apple-m1-${UBOOT_VERSION} 19PKGNAME= u-boot-apple-m1-${UBOOT_VERSION}
18BUILD_TARGET= u-boot-nodtb.bin 20BUILD_TARGET= u-boot-nodtb.bin
19 21
20USE_TOOLS+= gzip 22USE_TOOLS+= gzip
21 23
22BUILD_DEPENDS+= m1n1>=0:../../sysutils/m1n1 24BUILD_DEPENDS+= m1n1>=0:../../sysutils/m1n1
23BUILD_DEPENDS+= dtc>=0:../../sysutils/dtc 25BUILD_DEPENDS+= dtc>=0:../../sysutils/dtc
24 26
25DTS_DIR= ${WRKSRC}/arch/arm/dts 27DTS_DIR= ${WRKSRC}/arch/arm/dts
26DTS_INC= ${WRKSRC}/include 28DTS_INC= ${WRKSRC}/include
27DTS_ARCH_INC= ${DTS_DIR}/include 29DTS_ARCH_INC= ${DTS_DIR}/include
28 30
 31DTS_BOARDS= t8103-j274 \
 32 t8103-j293
 33
 34.for board in ${DTS_BOARDS}
 35UBOOT_BIN+= u-boot-${board}.macho
 36.endfor
 37
29post-build: 38post-build:
 39 cp ${WRKSRC}/u-boot-nodtb.bin ${WRKDIR}
 40 rm -f ${WRKDIR}/u-boot-nodtb.bin.gz && gzip ${WRKDIR}/u-boot-nodtb.bin
 41.for board in ${DTS_BOARDS}
30 cd ${DTS_DIR} && \ 42 cd ${DTS_DIR} && \
31 ${CPP} -P -x assembler-with-cpp -I ${DTS_INC} -I ${DTS_ARCH_INC} \ 43 ${CPP} -P -x assembler-with-cpp -I ${DTS_INC} -I ${DTS_ARCH_INC} \
32 -include ${DTS_DIR}/t8103-j274.dts /dev/null | \ 44 -include ${DTS_DIR}/${board}.dts /dev/null | \
33 ${PREFIX}/bin/dtc -i ${DTS_INC} -i ${DTS_ARCH_INC} -I dts -O dtb \ 45 ${PREFIX}/bin/dtc -i ${DTS_INC} -i ${DTS_ARCH_INC} -I dts -O dtb \
34 -p 1024 -b 0 -o ${WRKDIR}/t8103-j274.dtb 46 -p 1024 -b 0 -o ${WRKDIR}/${board}.dtb
35 cp ${WRKSRC}/u-boot-nodtb.bin ${WRKDIR} 
36 rm -f ${WRKDIR}/u-boot-nodtb.bin.gz && gzip ${WRKDIR}/u-boot-nodtb.bin 
37 cat ${PREFIX}/share/m1n1/m1n1.macho \ 47 cat ${PREFIX}/share/m1n1/m1n1.macho \
38 ${WRKDIR}/u-boot-nodtb.bin.gz \ 48 ${WRKDIR}/u-boot-nodtb.bin.gz \
39 ${WRKDIR}/t8103-j274.dtb \ 49 ${WRKDIR}/${board}.dtb \
40 > ${WRKSRC}/u-boot.macho 50 > ${WRKSRC}/u-boot-${board}.macho
 51.endfor
41 52
42.include "../../sysutils/u-boot/u-boot-arm64.mk" 53.include "../../sysutils/u-boot/u-boot-arm64.mk"
43.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-apple-m1/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-apple-m1/PLIST 2021/03/06 20:17:39 1.1
+++ pkgsrc/sysutils/u-boot-apple-m1/PLIST 2021/09/03 20:50:00 1.2
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1@comment $NetBSD: PLIST,v 1.1 2021/03/06 20:17:39 jmcneill Exp $ 1@comment $NetBSD: PLIST,v 1.2 2021/09/03 20:50:00 jmcneill Exp $
2share/u-boot/apple-m1/u-boot-nodtb.bin 2share/u-boot/apple-m1/u-boot-nodtb.bin
3share/u-boot/apple-m1/u-boot.macho 3share/u-boot/apple-m1/u-boot-t8103-j274.macho
 4share/u-boot/apple-m1/u-boot-t8103-j293.macho
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-apple-m1/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-apple-m1/distinfo 2021/08/30 23:44:39 1.2
+++ pkgsrc/sysutils/u-boot-apple-m1/distinfo 2021/09/03 20:50:00 1.3
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.2 2021/08/30 23:44:39 jmcneill Exp $ 1$NetBSD: distinfo,v 1.3 2021/09/03 20:50:00 jmcneill Exp $
2 2
3SHA1 (u-boot/u-boot-apple-m1-8e7191541ca9b4cda9ee191b2728cf29f1660bdd-8e7191541ca9b4cda9ee191b2728cf29f1660bdd.tar.gz) = 7eaa9c3610faafa695040f60708f478dae63ccf9 3SHA1 (u-boot/u-boot-apple-m1-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d.tar.gz) = 604308d2190518585ef650f69a4a1d7c69dfc369
4RMD160 (u-boot/u-boot-apple-m1-8e7191541ca9b4cda9ee191b2728cf29f1660bdd-8e7191541ca9b4cda9ee191b2728cf29f1660bdd.tar.gz) = 28db81df99ff76504eda96d1dff3b931fc1f2123 4RMD160 (u-boot/u-boot-apple-m1-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d.tar.gz) = 136f34807a3f1ee0b1d6d882aee46a434cf220ac
5SHA512 (u-boot/u-boot-apple-m1-8e7191541ca9b4cda9ee191b2728cf29f1660bdd-8e7191541ca9b4cda9ee191b2728cf29f1660bdd.tar.gz) = 8e26ababbf512cdd7e2653f65b7b6497270ddfb81e322f958a1f535c1c70c8a82131ffb27aa423a0a2d0dc26988f7b9a7ad35130c7c1dae863677bdf47ac5a87 5SHA512 (u-boot/u-boot-apple-m1-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d.tar.gz) = 2aacd1c6be21f91e735e359bf41ce3ffafd0c0ad496a893d7c911dce4eba9bbda1e17caf8bf260cdb965182b1d51beb46562cb42d5860ff48e3c4295b1ff0c3d
6Size (u-boot/u-boot-apple-m1-8e7191541ca9b4cda9ee191b2728cf29f1660bdd-8e7191541ca9b4cda9ee191b2728cf29f1660bdd.tar.gz) = 21276309 bytes 6Size (u-boot/u-boot-apple-m1-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d-c6aa1280001d2a3a0f17c1853cd175fe5c21eb3d.tar.gz) = 21276320 bytes