diff --git a/sysutils/firmware/apple-boot/Makefile b/sysutils/firmware/apple-boot/Makefile index f7683eb1e6d..abec2f7aa0a 100644 --- a/sysutils/firmware/apple-boot/Makefile +++ b/sysutils/firmware/apple-boot/Makefile @@ -1,6 +1,6 @@ FW_DRIVER= apple-boot FW_VER= 1.0 -REVISION= 4 +REVISION= 5 WRKDIST= ${WRKDIR} DISTFILES= @@ -11,7 +11,7 @@ PERMIT_PACKAGE= firmware PERMIT_DISTFILES= Yes BUILD_DEPENDS= m1n1-=1.1.6p2:sysutils/m1n1:build \ - u-boot-asahi-=2022.07.3p4:sysutils/u-boot-asahi:build + u-boot-asahi-=2022.07.3p5:sysutils/u-boot-asahi:build ASAHI_BUILD= ${WRKSRC}/sysutils/u-boot-asahi/u-boot-asahi-*/build M1N1_BUILD= ${WRKSRC}/sysutils/m1n1/m1n1-*/build diff --git a/sysutils/u-boot-asahi/Makefile b/sysutils/u-boot-asahi/Makefile index 2d665e4ea0b..26f8a75ac5f 100644 --- a/sysutils/u-boot-asahi/Makefile +++ b/sysutils/u-boot-asahi/Makefile @@ -6,7 +6,7 @@ VERSION= 2022.07-3 GH_ACCOUNT= AsahiLinux GH_PROJECT= u-boot GH_TAGNAME= asahi-v${VERSION} -REVISION= 4 +REVISION= 5 PKGNAME= u-boot-asahi-${VERSION:S/-/./g} diff --git a/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t6001-j375c_dts b/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t6001-j375c_dts new file mode 100644 index 00000000000..c5c3035d918 --- /dev/null +++ b/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t6001-j375c_dts @@ -0,0 +1,19 @@ +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>; diff --git a/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t6002-j375d_dts b/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t6002-j375d_dts new file mode 100644 index 00000000000..7832bf4fccf --- /dev/null +++ b/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t6002-j375d_dts @@ -0,0 +1,19 @@ +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>; diff --git a/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t600x-j314-j316_dtsi b/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t600x-j314-j316_dtsi new file mode 100644 index 00000000000..ac3be1545e8 --- /dev/null +++ b/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t600x-j314-j316_dtsi @@ -0,0 +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"; +- + dai-link@0 { + link-name = "Speakers"; + mclk-fs = <256>;