> Date: Sun, 31 Mar 2024 13:23:41 +0000
> From: Klemens Nanni <k...@openbsd.org>
>
> Default snapshot install works with the intial UEFI/u-boot from macOS/Asahi.
>
> After manual fw_update(8) via urndis(4) tethering to install apple-boot-1.2
> and cold reboot, it still boots the initial UEFI/u-boot and works.
>
> Once I run sysupgrade(8), after the upgrade the boot firmware is switched to
> our apple-boot (visible via tobhe's OpenBSD logo) which gets stuck before
> reaching our bootloader.
>
> First time using Apple silicon, so I don't have a clue yet what's going on.
>
> Loose transcription, picture attached.
>
> Chip-ID: 0x6020
>
> OS FW version: 13.5 (iBoot-8422.141.2)
> System FW version: unknown (iBoot 10151.101.3)
> [...]
> Initialization complete.
> Cechking for payloads...
> Devicetree compatible value: apple,j416s
> Found a gzip compressed payload at 0x100041dc200
> Uncompressing... 272386 bytes uncompressed to 562704 bytes
> Found a kernel at 0x10006a00000
> Found a variable at 0x1000421ea02: chosen.asahi,efi-system-partition=...
> No more payloads at 0x1000421ea19
> ERROR: Kernel found but not devicetree for apple,j416s available.
Looks like I missed hooking up the devicetree for your model to the
build. Instead I added apple,j414s twice :(.
Looks like the last PLIST updated was botched as well.
Diff below should fix things. Stuart, what are the chances of
updating the firmware for the release?
Index: sysutils/u-boot-asahi/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/u-boot-asahi/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- sysutils/u-boot-asahi/Makefile 8 Jan 2024 19:59:11 -0000 1.15
+++ sysutils/u-boot-asahi/Makefile 31 Mar 2024 16:15:34 -0000
@@ -6,6 +6,7 @@ VERSION= 2024.01
GH_ACCOUNT= AsahiLinux
GH_PROJECT= u-boot
GH_TAGNAME= openbsd-v${VERSION}
+REVISION= 0
PKGNAME= u-boot-asahi-${VERSION:S/-/./g}
Index: sysutils/u-boot-asahi/patches/patch-arch_arm_dts_Makefile
===================================================================
RCS file: sysutils/u-boot-asahi/patches/patch-arch_arm_dts_Makefile
diff -N sysutils/u-boot-asahi/patches/patch-arch_arm_dts_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/u-boot-asahi/patches/patch-arch_arm_dts_Makefile 31 Mar 2024
16:15:34 -0000
@@ -0,0 +1,12 @@
+Index: arch/arm/dts/Makefile
+--- arch/arm/dts/Makefile.orig
++++ arch/arm/dts/Makefile
+@@ -40,7 +40,7 @@ dtb-$(CONFIG_ARCH_APPLE) += \
+ t6001-j375c.dtb \
+ t6002-j375d.dtb \
+ t6020-j414s.dtb \
+- t6020-j414s.dtb \
++ t6020-j416s.dtb \
+ t6020-j474s.dtb \
+ t6021-j414c.dtb \
+ t6021-j416c.dtb \
Index: sysutils/u-boot-asahi/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/u-boot-asahi/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- sysutils/u-boot-asahi/pkg/PLIST 3 Dec 2023 22:55:16 -0000 1.4
+++ sysutils/u-boot-asahi/pkg/PLIST 31 Mar 2024 16:15:34 -0000
@@ -9,10 +9,13 @@ share/u-boot/apple_m1/dts/t6001-j316c.dt
share/u-boot/apple_m1/dts/t6001-j375c.dtb
share/u-boot/apple_m1/dts/t6002-j375d.dtb
share/u-boot/apple_m1/dts/t6020-j414s.dtb
+share/u-boot/apple_m1/dts/t6020-j416s.dtb
share/u-boot/apple_m1/dts/t6020-j474s.dtb
share/u-boot/apple_m1/dts/t6021-j414c.dtb
share/u-boot/apple_m1/dts/t6021-j416c.dtb
+share/u-boot/apple_m1/dts/t6021-j475c.dtb
share/u-boot/apple_m1/dts/t6022-j180d.dtb
+share/u-boot/apple_m1/dts/t6022-j475d.dtb
share/u-boot/apple_m1/dts/t8103-j274.dtb
share/u-boot/apple_m1/dts/t8103-j293.dtb
share/u-boot/apple_m1/dts/t8103-j313.dtb
Index: sysutils/firmware/apple-boot/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/firmware/apple-boot/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- sysutils/firmware/apple-boot/Makefile 8 Jan 2024 20:00:31 -0000
1.16
+++ sysutils/firmware/apple-boot/Makefile 31 Mar 2024 16:15:34 -0000
@@ -1,5 +1,5 @@
FW_DRIVER= apple-boot
-FW_VER= 1.2
+FW_VER= 1.3
WRKDIST= ${WRKDIR}
DISTFILES=
@@ -10,7 +10,7 @@ PERMIT_PACKAGE= firmware
PERMIT_DISTFILES= Yes
BUILD_DEPENDS= m1n1-=1.4.11:sysutils/m1n1:build \
- u-boot-asahi-=2024.01:sysutils/u-boot-asahi:build
+ u-boot-asahi-=2024.01p0:sysutils/u-boot-asahi:build
ASAHI_BUILD= ${WRKSRC}/sysutils/u-boot-asahi/u-boot-*/build
M1N1_BUILD= ${WRKSRC}/sysutils/m1n1/m1n1-*/build
