diff --git a/sysutils/firmware/apple-boot/Makefile b/sysutils/firmware/apple-boot/Makefile index 7baecafe7e9..26b8dcd0655 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= 0 +REVISION= 1 WRKDIST= ${WRKDIR} DISTFILES= @@ -11,7 +11,7 @@ PERMIT_PACKAGE= firmware PERMIT_DISTFILES= Yes BUILD_DEPENDS= m1n1-=1.1.6p1:sysutils/m1n1 \ - u-boot-asahi-=2022.07.3p1:sysutils/u-boot-asahi + u-boot-asahi-=2022.07.3p2:sysutils/u-boot-asahi do-install: cat ${LOCALBASE}/share/m1n1/m1n1.bin \ diff --git a/sysutils/u-boot-asahi/Makefile b/sysutils/u-boot-asahi/Makefile index 4ccc094e460..0f3e2100ac1 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= 1 +REVISION= 2 PKGNAME= u-boot-asahi-${VERSION:S/-/./g} diff --git a/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t8103-j293_dts b/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t8103-j293_dts new file mode 100644 index 00000000000..46929c8c4e4 --- /dev/null +++ b/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t8103-j293_dts @@ -0,0 +1,19 @@ +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"; + + dai-link@0 { +- /* +- * 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"; +- + link-name = "Speakers"; + mclk-fs = <64>; + diff --git a/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t8103-j313_dts b/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t8103-j313_dts new file mode 100644 index 00000000000..ac418831b61 --- /dev/null +++ b/sysutils/u-boot-asahi/patches/patch-arch_arm_dts_t8103-j313_dts @@ -0,0 +1,19 @@ +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"; + + dai-link@0 { +- /* +- * 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"; +- + link-name = "Speakers"; + mclk-fs = <64>; +