From: Mark Kettenis <mark.kettenis@xs4all.nl>
Subject: Re: Update m1n1 and apple-boot firmware
To: Stuart Henderson <stu@spacehopper.org>
Cc: tobhe@openbsd.org, ports@openbsd.org
Date: Sat, 18 May 2024 10:56:14 +0200

> From: Stuart Henderson <stu@spacehopper.org>
> Date: Fri, 17 May 2024 20:49:33 +0100
> 
> Better hold off for now, seems there's a display init problem on M1 (at
> least desktop)

Fixed in m1n1 1.4.14.

> On 17 May 2024 20:20:47 Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
> 
>  https://social.treehouse.systems/@AsahiLinux/112454079096607233
> 
>  This updates m1n1 to a version that has the mentioned workaround.
>  Once this is in, we should make the new firmware available, probably
>  also for the 7.5 release.
> 
>  ok?
> 


Index: sysutils/m1n1/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/m1n1/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- sysutils/m1n1/Makefile	8 Jan 2024 19:57:24 -0000	1.14
+++ sysutils/m1n1/Makefile	18 May 2024 08:53:49 -0000
@@ -4,7 +4,7 @@ COMMENT=	Bootloader for Apple Silicon
 
 GH_ACCOUNT=	AsahiLinux
 GH_PROJECT=	m1n1
-GH_TAGNAME=	v1.4.11
+GH_TAGNAME=	v1.4.14
 
 CATEGORIES=	sysutils
 HOMEPAGE=	https://github.com/AsahiLinux/m1n1
Index: sysutils/m1n1/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/m1n1/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- sysutils/m1n1/distinfo	8 Jan 2024 19:57:24 -0000	1.7
+++ sysutils/m1n1/distinfo	18 May 2024 08:53:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (m1n1-1.4.11.tar.gz) = InZEkH2ElVuUIaU3F7PrtA36HZDHdC4oRjJUeAOETY4=
-SIZE (m1n1-1.4.11.tar.gz) = 825748
+SHA256 (m1n1-1.4.14.tar.gz) = YYcd0tJlMbTgf5s9sFFrWA+DbDXhYt5HmbTlVuhpgRk=
+SIZE (m1n1-1.4.14.tar.gz) = 837044
Index: sysutils/firmware/apple-boot/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/firmware/apple-boot/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- sysutils/firmware/apple-boot/Makefile	31 Mar 2024 19:14:06 -0000	1.17
+++ sysutils/firmware/apple-boot/Makefile	18 May 2024 08:53:49 -0000
@@ -1,5 +1,5 @@
 FW_DRIVER=	apple-boot
-FW_VER=		1.3
+FW_VER=		1.4
 
 WRKDIST=	${WRKDIR}
 DISTFILES=
@@ -9,7 +9,7 @@ DISTFILES=
 PERMIT_PACKAGE=	  firmware
 PERMIT_DISTFILES= Yes
 
-BUILD_DEPENDS=	m1n1-=1.4.11:sysutils/m1n1:build \
+BUILD_DEPENDS=	m1n1-=1.4.14:sysutils/m1n1:build \
 		u-boot-asahi-=2024.01p0:sysutils/u-boot-asahi:build
 
 ASAHI_BUILD=	${WRKSRC}/sysutils/u-boot-asahi/u-boot-*/build