On Tue, Apr 11, 2023 at 11:25:48AM +0100, Stuart Henderson wrote: > On 2023/04/10 19:45, Tobias Heider wrote: > > Update to to get the newer device trees with keyboard backlight and usb > > type-a support. The upstream maintainer was nice to us and added an > > openbsd release tag with all the good stuff included. > > Untested (I am just running via VMs on my m1) but lgtm. Don't forget to > update REVISION and BUILD_DEPENDS in sysutils/firmware/apple-boot. >
Thanks! I will update apple-boot once this one is committed. One more update because the first diff was actually missing the removal of patch-arch_arm_dts_t6002-j375d_dts and patch-arch_arm_dts_t6001-j375c_dts which are no longer needed. Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/u-boot-asahi/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile 5 Feb 2023 21:15:39 -0000 1.9 +++ Makefile 13 Apr 2023 23:16:48 -0000 @@ -2,11 +2,10 @@ COMMENT= U-Boot firmware for Apple Silicon -VERSION= 2022.07-3 +VERSION= 2023.04 GH_ACCOUNT= AsahiLinux GH_PROJECT= u-boot -GH_TAGNAME= asahi-v${VERSION} -REVISION= 5 +GH_TAGNAME= openbsd-v${VERSION} PKGNAME= u-boot-asahi-${VERSION:S/-/./g} Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/u-boot-asahi/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 25 Oct 2022 20:27:00 -0000 1.1.1.1 +++ distinfo 13 Apr 2023 23:16:48 -0000 @@ -1,2 +1,2 @@ -SHA256 (u-boot-asahi-v2022.07-3.tar.gz) = jR5RfM+ArQZsiNF6J8KRJUl9f4iD7WDJree/C9hUgq0= -SIZE (u-boot-asahi-v2022.07-3.tar.gz) = 23237466 +SHA256 (u-boot-openbsd-v2023.04.tar.gz) = qt1ShPpWt7zW3KEIkhjtVfOzFzuozRZcPh8PxvuyniY= +SIZE (u-boot-openbsd-v2023.04.tar.gz) = 24662447 Index: patches/patch-arch_arm_dts_t6001-j375c_dts =================================================================== RCS file: patches/patch-arch_arm_dts_t6001-j375c_dts diff -N patches/patch-arch_arm_dts_t6001-j375c_dts --- patches/patch-arch_arm_dts_t6001-j375c_dts 5 Feb 2023 21:15:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -Index: arch/arm/dts/t6001-j375c.dts ---- arch/arm/dts/t6001-j375c.dts.orig -+++ arch/arm/dts/t6001-j375c.dts -@@ -260,15 +260,6 @@ - compatible = "apple,j375-macaudio", "apple,macaudio"; - model = "Mac Studio J375 integrated audio"; - -- /* -- * DANGER ZONE: You can blow your speakers! -- * -- * The drivers are not ready, and unless you are careful -- * to attenuate the audio stream, you run the risk of -- * blowing your speakers. -- */ -- status = "disabled"; -- - dai-link@0 { - link-name = "Speaker"; - mclk-fs = <64>; Index: patches/patch-arch_arm_dts_t6002-j375d_dts =================================================================== RCS file: patches/patch-arch_arm_dts_t6002-j375d_dts diff -N patches/patch-arch_arm_dts_t6002-j375d_dts --- patches/patch-arch_arm_dts_t6002-j375d_dts 5 Feb 2023 21:15:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -Index: arch/arm/dts/t6002-j375d.dts ---- arch/arm/dts/t6002-j375d.dts.orig -+++ arch/arm/dts/t6002-j375d.dts -@@ -352,15 +352,6 @@ - compatible = "apple,j375-macaudio", "apple,macaudio"; - model = "Mac Studio J375 integrated audio"; - -- /* -- * DANGER ZONE: You can blow your speakers! -- * -- * The drivers are not ready, and unless you are careful -- * to attenuate the audio stream, you run the risk of -- * blowing your speakers. -- */ -- status = "disabled"; -- - dai-link@0 { - link-name = "Speaker"; - mclk-fs = <64>; Index: patches/patch-arch_arm_dts_t600x-j314-j316_dtsi =================================================================== RCS file: /cvs/ports/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t600x-j314-j316_dtsi,v retrieving revision 1.1 diff -u -p -r1.1 patch-arch_arm_dts_t600x-j314-j316_dtsi --- patches/patch-arch_arm_dts_t600x-j314-j316_dtsi 5 Feb 2023 21:15:39 -0000 1.1 +++ patches/patch-arch_arm_dts_t600x-j314-j316_dtsi 13 Apr 2023 23:16:48 -0000 @@ -1,19 +1,19 @@ Index: arch/arm/dts/t600x-j314-j316.dtsi --- arch/arm/dts/t600x-j314-j316.dtsi.orig +++ arch/arm/dts/t600x-j314-j316.dtsi -@@ -313,15 +313,6 @@ - compatible = "apple,j314-macaudio", "apple,macaudio"; - model = "MacBook Pro J314/6 integrated audio"; - -- /* -- * DANGER ZONE: You can blow your speakers! -- * -- * The drivers are not ready, and unless you are careful -- * to attenuate the audio stream, you run the risk of -- * blowing your speakers. -- */ -- status = "disabled"; -- +@@ -403,15 +403,6 @@ dai-link@0 { link-name = "Speakers"; - mclk-fs = <256>; + +- /* +- * DANGER ZONE: You can blow your speakers! +- * +- * The drivers are not ready, and unless you are careful +- * to attenuate the audio stream, you run the risk of +- * blowing your speakers. +- */ +- status = "disabled"; +- + cpu { + sound-dai = <&mca 0>, <&mca 1>; + }; Index: patches/patch-arch_arm_dts_t600x-j375_dtsi =================================================================== RCS file: patches/patch-arch_arm_dts_t600x-j375_dtsi diff -N patches/patch-arch_arm_dts_t600x-j375_dtsi --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-arch_arm_dts_t600x-j375_dtsi 13 Apr 2023 23:16:48 -0000 @@ -0,0 +1,18 @@ +Index: arch/arm/dts/t600x-j375.dtsi +--- arch/arm/dts/t600x-j375.dtsi.orig ++++ arch/arm/dts/t600x-j375.dtsi +@@ -292,14 +292,6 @@ + + dai-link@0 { + link-name = "Speaker"; +- /* +- * DANGER ZONE: You can blow your speakers! +- * +- * The drivers are not ready, and unless you are careful +- * to attenuate the audio stream, you run the risk of +- * blowing your speakers. +- */ +- status = "disabled"; + cpu { + sound-dai = <&mca 0>; + }; Index: patches/patch-arch_arm_dts_t8103-j293_dts =================================================================== RCS file: /cvs/ports/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t8103-j293_dts,v retrieving revision 1.1 diff -u -p -r1.1 patch-arch_arm_dts_t8103-j293_dts --- patches/patch-arch_arm_dts_t8103-j293_dts 17 Jan 2023 21:00:22 -0000 1.1 +++ patches/patch-arch_arm_dts_t8103-j293_dts 13 Apr 2023 23:16:48 -0000 @@ -1,10 +1,10 @@ Index: arch/arm/dts/t8103-j293.dts --- arch/arm/dts/t8103-j293.dts.orig +++ arch/arm/dts/t8103-j293.dts -@@ -138,15 +138,6 @@ - model = "MacBook Pro J293 integrated audio"; - +@@ -149,15 +149,6 @@ dai-link@0 { + link-name = "Speakers"; + - /* - * DANGER ZONE: You can blow your speakers! - * @@ -14,6 +14,6 @@ Index: arch/arm/dts/t8103-j293.dts - */ - status = "disabled"; - - link-name = "Speakers"; - mclk-fs = <64>; - + cpu { + sound-dai = <&mca 0>, <&mca 1>; + }; Index: patches/patch-arch_arm_dts_t8103-j313_dts =================================================================== RCS file: /cvs/ports/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t8103-j313_dts,v retrieving revision 1.1 diff -u -p -r1.1 patch-arch_arm_dts_t8103-j313_dts --- patches/patch-arch_arm_dts_t8103-j313_dts 17 Jan 2023 21:00:22 -0000 1.1 +++ patches/patch-arch_arm_dts_t8103-j313_dts 13 Apr 2023 23:16:48 -0000 @@ -1,10 +1,10 @@ Index: arch/arm/dts/t8103-j313.dts --- arch/arm/dts/t8103-j313.dts.orig +++ arch/arm/dts/t8103-j313.dts -@@ -116,15 +116,6 @@ - model = "MacBook Air J313 integrated audio"; +@@ -124,14 +124,6 @@ dai-link@0 { + link-name = "Speakers"; - /* - * DANGER ZONE: You can blow your speakers! - * @@ -13,7 +13,6 @@ Index: arch/arm/dts/t8103-j313.dts - * blowing your speakers. - */ - status = "disabled"; -- - link-name = "Speakers"; - mclk-fs = <64>; + cpu { + sound-dai = <&mca 0>, <&mca 1>; Index: patches/patch-arch_arm_dts_t8112-j413_dts =================================================================== RCS file: /cvs/ports/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t8112-j413_dts,v retrieving revision 1.1 diff -u -p -r1.1 patch-arch_arm_dts_t8112-j413_dts --- patches/patch-arch_arm_dts_t8112-j413_dts 4 Feb 2023 10:51:25 -0000 1.1 +++ patches/patch-arch_arm_dts_t8112-j413_dts 13 Apr 2023 23:16:48 -0000 @@ -1,10 +1,10 @@ Index: arch/arm/dts/t8112-j413.dts --- arch/arm/dts/t8112-j413.dts.orig +++ arch/arm/dts/t8112-j413.dts -@@ -135,15 +135,6 @@ - model = "MacBook Pro J413 integrated audio"; - +@@ -152,15 +152,6 @@ dai-link@0 { + link-name = "Speakers"; + - /* - * DANGER ZONE: You can blow your speakers! - * @@ -14,6 +14,6 @@ Index: arch/arm/dts/t8112-j413.dts - */ - status = "disabled"; - - link-name = "Speakers"; - mclk-fs = <64>; - + cpu { + sound-dai = <&mca 0>, <&mca 1>; + }; Index: patches/patch-arch_arm_dts_t8112-j493_dts =================================================================== RCS file: /cvs/ports/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t8112-j493_dts,v retrieving revision 1.1 diff -u -p -r1.1 patch-arch_arm_dts_t8112-j493_dts --- patches/patch-arch_arm_dts_t8112-j493_dts 4 Feb 2023 10:51:25 -0000 1.1 +++ patches/patch-arch_arm_dts_t8112-j493_dts 13 Apr 2023 23:16:48 -0000 @@ -1,10 +1,10 @@ Index: arch/arm/dts/t8112-j493.dts --- arch/arm/dts/t8112-j493.dts.orig +++ arch/arm/dts/t8112-j493.dts -@@ -124,15 +124,6 @@ - model = "MacBook Pro J493 integrated audio"; - +@@ -140,15 +140,6 @@ dai-link@0 { + link-name = "Speakers"; + - /* - * DANGER ZONE: You can blow your speakers! - * @@ -14,6 +14,6 @@ Index: arch/arm/dts/t8112-j493.dts - */ - status = "disabled"; - - link-name = "Speakers"; - mclk-fs = <64>; - + cpu { + sound-dai = <&mca 0>, <&mca 1>; + };