From 2e01087fc4b82fdb5af2560d76db2adfbe2195b8 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Sat, 25 Nov 2023 21:56:49 +0100 Subject: [PATCH 01/37] bump kernel and m1n1 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 12 ++++++------ linux-asahi/config | 39 ++++++++++++++++++++++----------------- m1n1/PKGBUILD | 6 +++--- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 04d0f55..fe463fe 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,10 +5,10 @@ buildarch=8 _rcver=6.5 #_rcrel=3 -_asahirel=15 +_asahirel=29 pkgrel=1 -_m1n1_version=1.4.0 +_m1n1_version=1.4.7 pkgbase=linux-asahi #_commit_id=asahi-${_nextver}-${_asahirel} @@ -30,11 +30,11 @@ source=( config # the main kernel config file config.edge # overrides for linux-asahi-edge ) -sha256sums=('633796ecdc1e210565a67b20f8fdaa748204c32275403212a30f735b8de66abd' - '46917e449d51ce37675442cd280892f6521b719bdb75a05b558d456ad7fc9193' +sha256sums=('7adde8a9632c80e4d5b76bcd959e39622600ad9c0983ed32f28db0da9cc41c24' + '6b9f9651b04b064314e55b7d0b92383d8a4aa80df3dc59afc37289c4d68717f9' '5cbdda1262f989a5247f4ef70690b569f9be8212bf8f576242bf6ac69036bddf') -b2sums=('f1e8ca0919f218dce288a9f024fd211239212a17d7c19cf5f43736519fc6e7b7ef90853c3d80485ada2f2b2c0d91954c543f8f52d517317f25deed118cd8a0cd' - '8b3089d22d0b68e9b0c20a5e8f7ebe2626ef43cdc7053a94590ea3ca25417e76866e220ae98ff184e4912033d877eb89fd3c64bbe476889696220c5dd3b05e97' +b2sums=('3f3c5f0929a52a388eca314e4295c459e7439c63ceb5881eccf8a4663acf2fb0fcd2288391db871a5cb893ccf45ce1b61f6960583b85cfc96ef82216aa95c2ae' + '52ee4aa55c0a8322057b47793417cb59e5907b15330f88ba28ae5dc594c4e3496f64057de78c7b7be08ed08ad45c1a08f597bbcc6a8d5b76c34ebab9c00074b9' '01a8b3b7e3c7bd528f6d07d2b581b8a56688305d42fdd0b1555fd26319c4369e2357bcaa8434a1a5e3123aa9fdc6f1a24de4813b819397af89ba8d0c5e896228') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase diff --git a/linux-asahi/config b/linux-asahi/config index 02d7b8c..2b5c0b5 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -2,20 +2,21 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 6.5.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" -CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120100 -CONFIG_CLANG_VERSION=0 -CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23800 -CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23800 -CONFIG_LLD_VERSION=0 +CONFIG_CC_VERSION_TEXT="clang version 16.0.6" +CONFIG_GCC_VERSION=0 +CONFIG_CC_IS_CLANG=y +CONFIG_CLANG_VERSION=160006 +CONFIG_AS_IS_LLVM=y +CONFIG_AS_VERSION=160006 +CONFIG_LD_VERSION=0 +CONFIG_LD_IS_LLD=y +CONFIG_LLD_VERSION=160006 CONFIG_RUST_IS_AVAILABLE=y CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=125 @@ -168,9 +169,8 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_HAS_INT128=y -CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough" CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y @@ -271,12 +271,12 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_RUST=y -CONFIG_RUSTC_VERSION_TEXT="rustc 1.72.1 (d5c2e9c34 2023-09-13) (Arch Linux rust 1:1.72.1-1)" -CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.68.1" +CONFIG_RUSTC_VERSION_TEXT="rustc 1.68.2 (9eb3afe9e 2023-03-27)" +CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.66.0" # end of General setup CONFIG_ARM64=y -CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_64BIT=y CONFIG_MMU=y CONFIG_ARM64_PAGE_SHIFT=14 @@ -480,6 +480,7 @@ CONFIG_ARM64_TLB_RANGE=y # CONFIG_AS_HAS_ARMV8_5=y CONFIG_ARM64_BTI=y +CONFIG_ARM64_BTI_KERNEL=y CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y CONFIG_ARM64_E0PD=y CONFIG_ARM64_AS_HAS_MTE=y @@ -670,8 +671,12 @@ CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y # CONFIG_SHADOW_CALL_STACK is not set CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y +CONFIG_HAS_LTO_CLANG=y CONFIG_LTO_NONE=y +# CONFIG_LTO_CLANG_FULL is not set +# CONFIG_LTO_CLANG_THIN is not set CONFIG_ARCH_SUPPORTS_CFI_CLANG=y +# CONFIG_CFI_CLANG is not set CONFIG_HAVE_CONTEXT_TRACKING_USER=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -707,6 +712,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y +CONFIG_RELR=y CONFIG_HAVE_PREEMPT_DYNAMIC=y CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y @@ -722,7 +728,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT=4 # end of General architecture-dependent options @@ -7121,7 +7126,9 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # CONFIG_ZERO_CALL_USED_REGS is not set # end of Memory initialization +CONFIG_CC_HAS_RANDSTRUCT=y CONFIG_RANDSTRUCT_NONE=y +# CONFIG_RANDSTRUCT_FULL is not set # end of Kernel hardening options # end of Security options @@ -7593,9 +7600,7 @@ CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF5 is not set CONFIG_FRAME_WARN=2048 CONFIG_STRIP_ASM_SYMS=y -# CONFIG_READABLE_ASM is not set # CONFIG_HEADERS_INSTALL is not set -CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y diff --git a/m1n1/PKGBUILD b/m1n1/PKGBUILD index 0b3d713..81a420d 100644 --- a/m1n1/PKGBUILD +++ b/m1n1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Hector Martin pkgname=m1n1 -pkgver=1.4.2 +pkgver=1.4.7 pkgrel=1 pkgdesc='Asahi Linux bootloader' _artwork_commit_id=35626c31f5c5a8a884aaff93f864795026495742 @@ -17,9 +17,9 @@ source=( "m1n1-${_m1n1_commit_id}.tar.gz::https://github.com/AsahiLinux/m1n1/archive/${_m1n1_commit_id}.tar.gz" ) sha256sums=('ffa129b5cae8debd4ffd97f7f1ac7f571c7ba4679793cd138918c2ae76a7103d' - '274ef86e72211882d3aadd7d1cd693731c0745082a7e73fca4af184a2c82543c') + '2f40d52d880e3dea1054f82979fa24323f02ad7e03d4a68703ac3542a444926e') b2sums=('26e9668f7c7393fec24b53b184ea0eabed4f46479c1aab26728d01c179091683cc4387ff83796bdcbb289376236faf9f651197b9fbba51e52540e58ebdc8bcc5' - 'eefae6c9e2886b5701837f1f58aa6875af47d07410b5e0b2f254f13371f7eb0563deb6720a5f1b72480b632280f841634ceb81bcd11ba57a7c65a7ae87d60cae') + '9849ab15cf471f7b8e11ebe6d5427a70f86773b572d280c802dc2e18334e7889215eff0ce4ee136b173f51ff5b93e559542db27404e77cd39473d907696cf89e') prepare() { rm -rf "${srcdir}/$_m1n1_srcname"/artwork From 820f3048280f59db4cc61d3a97b85d59e6ceb14c Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Wed, 29 Nov 2023 22:25:20 +0100 Subject: [PATCH 02/37] bump again Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 16 ++++++++-------- m1n1/PKGBUILD | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index fe463fe..1eee201 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -3,12 +3,12 @@ buildarch=8 -_rcver=6.5 +_rcver=6.6 #_rcrel=3 -_asahirel=29 +_asahirel=2 pkgrel=1 -_m1n1_version=1.4.7 +_m1n1_version=1.4.8 pkgbase=linux-asahi #_commit_id=asahi-${_nextver}-${_asahirel} @@ -30,11 +30,11 @@ source=( config # the main kernel config file config.edge # overrides for linux-asahi-edge ) -sha256sums=('7adde8a9632c80e4d5b76bcd959e39622600ad9c0983ed32f28db0da9cc41c24' - '6b9f9651b04b064314e55b7d0b92383d8a4aa80df3dc59afc37289c4d68717f9' +sha256sums=('379158e6327d4b50077d9eda8fe10d828b61b740a3086656176f59a020d400ff' + '46917e449d51ce37675442cd280892f6521b719bdb75a05b558d456ad7fc9193' '5cbdda1262f989a5247f4ef70690b569f9be8212bf8f576242bf6ac69036bddf') -b2sums=('3f3c5f0929a52a388eca314e4295c459e7439c63ceb5881eccf8a4663acf2fb0fcd2288391db871a5cb893ccf45ce1b61f6960583b85cfc96ef82216aa95c2ae' - '52ee4aa55c0a8322057b47793417cb59e5907b15330f88ba28ae5dc594c4e3496f64057de78c7b7be08ed08ad45c1a08f597bbcc6a8d5b76c34ebab9c00074b9' +b2sums=('67bd0a1127098ace730e8c8facc5e0d45baa5d5b6e0df2a49f6ae428ee202c18457f9d01d13e382e9539bc77ffe80e4601d14a14a66f596a81bf7885e9cec73b' + '8b3089d22d0b68e9b0c20a5e8f7ebe2626ef43cdc7053a94590ea3ca25417e76866e220ae98ff184e4912033d877eb89fd3c64bbe476889696220c5dd3b05e97' '01a8b3b7e3c7bd528f6d07d2b581b8a56688305d42fdd0b1555fd26319c4369e2357bcaa8434a1a5e3123aa9fdc6f1a24de4813b819397af89ba8d0c5e896228') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase @@ -114,7 +114,7 @@ _package_kernel() { install -Dt "$modulesdir/dtbs" "$O"/arch/arm64/boot/dts/apple/*.dtb # remove build and source links - rm "$modulesdir"/{source,build} + rm -f "$modulesdir"/{source,build} } _package() { diff --git a/m1n1/PKGBUILD b/m1n1/PKGBUILD index 81a420d..3552a2e 100644 --- a/m1n1/PKGBUILD +++ b/m1n1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Hector Martin pkgname=m1n1 -pkgver=1.4.7 +pkgver=1.4.8 pkgrel=1 pkgdesc='Asahi Linux bootloader' _artwork_commit_id=35626c31f5c5a8a884aaff93f864795026495742 @@ -17,9 +17,9 @@ source=( "m1n1-${_m1n1_commit_id}.tar.gz::https://github.com/AsahiLinux/m1n1/archive/${_m1n1_commit_id}.tar.gz" ) sha256sums=('ffa129b5cae8debd4ffd97f7f1ac7f571c7ba4679793cd138918c2ae76a7103d' - '2f40d52d880e3dea1054f82979fa24323f02ad7e03d4a68703ac3542a444926e') + 'a2141a4a412775d9f25b759611c5d010a1ec6929eadf895a094ca2f7ae37ac28') b2sums=('26e9668f7c7393fec24b53b184ea0eabed4f46479c1aab26728d01c179091683cc4387ff83796bdcbb289376236faf9f651197b9fbba51e52540e58ebdc8bcc5' - '9849ab15cf471f7b8e11ebe6d5427a70f86773b572d280c802dc2e18334e7889215eff0ce4ee136b173f51ff5b93e559542db27404e77cd39473d907696cf89e') + 'c11a1537adbdaf78b388c2b37818de50b7d19ce5fac9d18c3fdd3fb09e7ddb592c780da8d5e129527a1d2673a7eee13f3590d0b833eaa064b2ba1c4642f5753c') prepare() { rm -rf "${srcdir}/$_m1n1_srcname"/artwork From 111d30eabb93d01e305dd3942b3f980412fb3b35 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Thu, 30 Nov 2023 19:59:54 +0100 Subject: [PATCH 03/37] bump to 6.6-4 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 1eee201..08a1077 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,7 +5,7 @@ buildarch=8 _rcver=6.6 #_rcrel=3 -_asahirel=2 +_asahirel=4 pkgrel=1 _m1n1_version=1.4.8 @@ -30,11 +30,11 @@ source=( config # the main kernel config file config.edge # overrides for linux-asahi-edge ) -sha256sums=('379158e6327d4b50077d9eda8fe10d828b61b740a3086656176f59a020d400ff' - '46917e449d51ce37675442cd280892f6521b719bdb75a05b558d456ad7fc9193' +sha256sums=('5892f8b5c96092580bc410b3c74993a2c34aea5baa1d9198521d1e9fb8268b7e' + '6b9f9651b04b064314e55b7d0b92383d8a4aa80df3dc59afc37289c4d68717f9' '5cbdda1262f989a5247f4ef70690b569f9be8212bf8f576242bf6ac69036bddf') -b2sums=('67bd0a1127098ace730e8c8facc5e0d45baa5d5b6e0df2a49f6ae428ee202c18457f9d01d13e382e9539bc77ffe80e4601d14a14a66f596a81bf7885e9cec73b' - '8b3089d22d0b68e9b0c20a5e8f7ebe2626ef43cdc7053a94590ea3ca25417e76866e220ae98ff184e4912033d877eb89fd3c64bbe476889696220c5dd3b05e97' +b2sums=('e7d5133b1463912454d8d62387ac94f3c3ab01144ac1b5ddd320bdfd162233b39cea0dc1041a47924ee6098a566063b3de76e59758f0289914d7fbafe5f50365' + '52ee4aa55c0a8322057b47793417cb59e5907b15330f88ba28ae5dc594c4e3496f64057de78c7b7be08ed08ad45c1a08f597bbcc6a8d5b76c34ebab9c00074b9' '01a8b3b7e3c7bd528f6d07d2b581b8a56688305d42fdd0b1555fd26319c4369e2357bcaa8434a1a5e3123aa9fdc6f1a24de4813b819397af89ba8d0c5e896228') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase From 1e51489ccf10cf97dee5ea7587ade4643949f573 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Fri, 1 Dec 2023 15:57:46 +0100 Subject: [PATCH 04/37] put all -edge config in base too Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 8 ++++---- linux-asahi/config | 9 +++++---- linux-asahi/config.edge | 6 ------ 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 08a1077..0a37a47 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -31,11 +31,11 @@ source=( config.edge # overrides for linux-asahi-edge ) sha256sums=('5892f8b5c96092580bc410b3c74993a2c34aea5baa1d9198521d1e9fb8268b7e' - '6b9f9651b04b064314e55b7d0b92383d8a4aa80df3dc59afc37289c4d68717f9' - '5cbdda1262f989a5247f4ef70690b569f9be8212bf8f576242bf6ac69036bddf') + 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817' + 'a30d8bfd24b9cdd45755bf5eda9ba876195a860527552d1e704516702e792872') b2sums=('e7d5133b1463912454d8d62387ac94f3c3ab01144ac1b5ddd320bdfd162233b39cea0dc1041a47924ee6098a566063b3de76e59758f0289914d7fbafe5f50365' - '52ee4aa55c0a8322057b47793417cb59e5907b15330f88ba28ae5dc594c4e3496f64057de78c7b7be08ed08ad45c1a08f597bbcc6a8d5b76c34ebab9c00074b9' - '01a8b3b7e3c7bd528f6d07d2b581b8a56688305d42fdd0b1555fd26319c4369e2357bcaa8434a1a5e3123aa9fdc6f1a24de4813b819397af89ba8d0c5e896228') + 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729' + '329d247959ba2862a7e55714ebc59886c62b840f1cab9d27b7b74b2379789f0da607b08c22b5ceddf6d2487761f6cba350d6e0997d53c0f2642e81d7da3c4c8b') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" diff --git a/linux-asahi/config b/linux-asahi/config index 2b5c0b5..2f9c181 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -515,7 +515,7 @@ CONFIG_DMI=y # # Power management options # -# CONFIG_SUSPEND is not set +CONFIG_SUSPEND=y # CONFIG_HIBERNATION is not set CONFIG_PM=y CONFIG_PM_DEBUG=y @@ -4873,6 +4873,7 @@ CONFIG_DRM_TTM=y CONFIG_DRM_VRAM_HELPER=y CONFIG_DRM_TTM_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=y +CONFIG_DRM_SCHED=y # # I2C encoder or helper chips @@ -4894,9 +4895,9 @@ CONFIG_DRM_GEM_SHMEM_HELPER=y # CONFIG_DRM_RADEON is not set # CONFIG_DRM_AMDGPU is not set # CONFIG_DRM_NOUVEAU is not set -CONFIG_DRM_VGEM=y +CONFIG_DRM_VGEM=n # CONFIG_DRM_VKMS is not set -# CONFIG_DRM_ASAHI is not set +CONFIG_DRM_ASAHI=m # CONFIG_DRM_VMWGFX is not set # CONFIG_DRM_UDL is not set # CONFIG_DRM_AST is not set @@ -5015,7 +5016,7 @@ CONFIG_DRM_SIMPLEDRM=y # CONFIG_DRM_ADP is not set # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set -# CONFIG_DRM_APPLE is not set +CONFIG_DRM_APPLE=m # CONFIG_DRM_LEGACY is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y diff --git a/linux-asahi/config.edge b/linux-asahi/config.edge index 3af63bd..cc966ed 100644 --- a/linux-asahi/config.edge +++ b/linux-asahi/config.edge @@ -1,7 +1 @@ -CONFIG_DRM_APPLE=m CONFIG_LOCALVERSION="-edge-ARCH" -CONFIG_DRM_VGEM=n -CONFIG_DRM_SCHED=y -CONFIG_DRM_GEM_SHMEM_HELPER=y -CONFIG_DRM_ASAHI=m -CONFIG_SUSPEND=y From e8398efd948228d1311e94f3d0b774dc8297ecea Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Mon, 4 Dec 2023 16:27:25 +0100 Subject: [PATCH 05/37] bump to 6.6-6 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 0a37a47..e24f3e1 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,7 +5,7 @@ buildarch=8 _rcver=6.6 #_rcrel=3 -_asahirel=4 +_asahirel=6 pkgrel=1 _m1n1_version=1.4.8 @@ -30,10 +30,10 @@ source=( config # the main kernel config file config.edge # overrides for linux-asahi-edge ) -sha256sums=('5892f8b5c96092580bc410b3c74993a2c34aea5baa1d9198521d1e9fb8268b7e' +sha256sums=('3506c49eb949660bb1e561655b4fe4d0eb5ee1b9b08812d77c28c300f05c0c38' 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817' 'a30d8bfd24b9cdd45755bf5eda9ba876195a860527552d1e704516702e792872') -b2sums=('e7d5133b1463912454d8d62387ac94f3c3ab01144ac1b5ddd320bdfd162233b39cea0dc1041a47924ee6098a566063b3de76e59758f0289914d7fbafe5f50365' +b2sums=('1288ce79d5721b171d31aa510af57b82887b44bece7e2abb78a3a984a3443f5d7f66635b9bf1fefe866118e9255a52b6f1c54ec41c2c5926a2121a9da7e7df2e' 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729' '329d247959ba2862a7e55714ebc59886c62b840f1cab9d27b7b74b2379789f0da607b08c22b5ceddf6d2487761f6cba350d6e0997d53c0f2642e81d7da3c4c8b') export KBUILD_BUILD_HOST=archlinux From 12be136d4f7979cc4ca9c6c3c33a4b9f8617c0f8 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Tue, 12 Dec 2023 23:24:03 +0100 Subject: [PATCH 06/37] bump to 6.6-9 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index e24f3e1..262d791 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,7 +5,7 @@ buildarch=8 _rcver=6.6 #_rcrel=3 -_asahirel=6 +_asahirel=9 pkgrel=1 _m1n1_version=1.4.8 @@ -30,10 +30,10 @@ source=( config # the main kernel config file config.edge # overrides for linux-asahi-edge ) -sha256sums=('3506c49eb949660bb1e561655b4fe4d0eb5ee1b9b08812d77c28c300f05c0c38' +sha256sums=('5c68b46be0a3e1654fa0f5bb8dcc093cb9d97140809ce4da224059ae87a45be0' 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817' 'a30d8bfd24b9cdd45755bf5eda9ba876195a860527552d1e704516702e792872') -b2sums=('1288ce79d5721b171d31aa510af57b82887b44bece7e2abb78a3a984a3443f5d7f66635b9bf1fefe866118e9255a52b6f1c54ec41c2c5926a2121a9da7e7df2e' +b2sums=('46b38ca13f6bf8852c8d7a6f78257bc0e804bb8321588406b22cf508cd4e816b704bc4946aabba64a64eafab8da9cd779bc6aeca24df30a7695526bcde97a280' 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729' '329d247959ba2862a7e55714ebc59886c62b840f1cab9d27b7b74b2379789f0da607b08c22b5ceddf6d2487761f6cba350d6e0997d53c0f2642e81d7da3c4c8b') export KBUILD_BUILD_HOST=archlinux From 98e9807a8376762a0dff7c8e7d583765fbca3cec Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Thu, 14 Dec 2023 08:33:30 +0100 Subject: [PATCH 07/37] bump to 6.6-10 and m1n1 to 1.4.9 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 6 +++--- m1n1/PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 262d791..6ca0b00 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,7 +5,7 @@ buildarch=8 _rcver=6.6 #_rcrel=3 -_asahirel=9 +_asahirel=10 pkgrel=1 _m1n1_version=1.4.8 @@ -30,10 +30,10 @@ source=( config # the main kernel config file config.edge # overrides for linux-asahi-edge ) -sha256sums=('5c68b46be0a3e1654fa0f5bb8dcc093cb9d97140809ce4da224059ae87a45be0' +sha256sums=('c7e66a52f74c789ba88c44a8cde3fd72ce90833155af3c6d66c4cb0bf8da68d9' 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817' 'a30d8bfd24b9cdd45755bf5eda9ba876195a860527552d1e704516702e792872') -b2sums=('46b38ca13f6bf8852c8d7a6f78257bc0e804bb8321588406b22cf508cd4e816b704bc4946aabba64a64eafab8da9cd779bc6aeca24df30a7695526bcde97a280' +b2sums=('a07be179e67173de8c28fb87c50a274b7c423cca00b0bebf51fbe1fa0761562741baef25b87d0f2d98210493274f1a6470da592b745591579f3f632fab8cd8d3' 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729' '329d247959ba2862a7e55714ebc59886c62b840f1cab9d27b7b74b2379789f0da607b08c22b5ceddf6d2487761f6cba350d6e0997d53c0f2642e81d7da3c4c8b') export KBUILD_BUILD_HOST=archlinux diff --git a/m1n1/PKGBUILD b/m1n1/PKGBUILD index 3552a2e..fa8a531 100644 --- a/m1n1/PKGBUILD +++ b/m1n1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Hector Martin pkgname=m1n1 -pkgver=1.4.8 +pkgver=1.4.9 pkgrel=1 pkgdesc='Asahi Linux bootloader' _artwork_commit_id=35626c31f5c5a8a884aaff93f864795026495742 @@ -17,9 +17,9 @@ source=( "m1n1-${_m1n1_commit_id}.tar.gz::https://github.com/AsahiLinux/m1n1/archive/${_m1n1_commit_id}.tar.gz" ) sha256sums=('ffa129b5cae8debd4ffd97f7f1ac7f571c7ba4679793cd138918c2ae76a7103d' - 'a2141a4a412775d9f25b759611c5d010a1ec6929eadf895a094ca2f7ae37ac28') + '02881214610b60e865b3765a0962240047f369f6ae66f7a41142debf76fbe9a0') b2sums=('26e9668f7c7393fec24b53b184ea0eabed4f46479c1aab26728d01c179091683cc4387ff83796bdcbb289376236faf9f651197b9fbba51e52540e58ebdc8bcc5' - 'c11a1537adbdaf78b388c2b37818de50b7d19ce5fac9d18c3fdd3fb09e7ddb592c780da8d5e129527a1d2673a7eee13f3590d0b833eaa064b2ba1c4642f5753c') + '71694dbfbb73fc49eb3edad98b805370fd6668f23766121d5691c9f57cdba18212f7876f830a2a12617be5a33cfad94f613993ba1206dcfe91d9037c97580acf') prepare() { rm -rf "${srcdir}/$_m1n1_srcname"/artwork From c9622a8dda43bb80b9a2986f1603545f8219536c Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Thu, 14 Dec 2023 20:27:11 +0100 Subject: [PATCH 08/37] bump to 6.6-11 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 6ca0b00..e6eb9ab 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,10 +5,10 @@ buildarch=8 _rcver=6.6 #_rcrel=3 -_asahirel=10 +_asahirel=11 pkgrel=1 -_m1n1_version=1.4.8 +_m1n1_version=1.4.9 pkgbase=linux-asahi #_commit_id=asahi-${_nextver}-${_asahirel} @@ -30,10 +30,10 @@ source=( config # the main kernel config file config.edge # overrides for linux-asahi-edge ) -sha256sums=('c7e66a52f74c789ba88c44a8cde3fd72ce90833155af3c6d66c4cb0bf8da68d9' +sha256sums=('33e8dc1565195b734a7cc45381e868c9adb20b77bfb32c04dd4795fc952ee449' 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817' 'a30d8bfd24b9cdd45755bf5eda9ba876195a860527552d1e704516702e792872') -b2sums=('a07be179e67173de8c28fb87c50a274b7c423cca00b0bebf51fbe1fa0761562741baef25b87d0f2d98210493274f1a6470da592b745591579f3f632fab8cd8d3' +b2sums=('d1c720ef252f96eb72479e9a3e76780680b83764833ed70f82f993e6ec00d61ff5943bf8e7704feea402d7067345d6e6135b6c50a09e76affa5933bca6c3140c' 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729' '329d247959ba2862a7e55714ebc59886c62b840f1cab9d27b7b74b2379789f0da607b08c22b5ceddf6d2487761f6cba350d6e0997d53c0f2642e81d7da3c4c8b') export KBUILD_BUILD_HOST=archlinux From 1e0630fff3fd83bf74923928ba345c91582ecf94 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Sun, 17 Dec 2023 22:08:03 +0100 Subject: [PATCH 09/37] bump to 6.6-13 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index e6eb9ab..60a11a5 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,7 +5,7 @@ buildarch=8 _rcver=6.6 #_rcrel=3 -_asahirel=11 +_asahirel=13 pkgrel=1 _m1n1_version=1.4.9 @@ -30,10 +30,10 @@ source=( config # the main kernel config file config.edge # overrides for linux-asahi-edge ) -sha256sums=('33e8dc1565195b734a7cc45381e868c9adb20b77bfb32c04dd4795fc952ee449' +sha256sums=('fb344f9c6ded5045be9d3c368b368dc9cb4af97d517423b2e48a319a0d929f1c' 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817' 'a30d8bfd24b9cdd45755bf5eda9ba876195a860527552d1e704516702e792872') -b2sums=('d1c720ef252f96eb72479e9a3e76780680b83764833ed70f82f993e6ec00d61ff5943bf8e7704feea402d7067345d6e6135b6c50a09e76affa5933bca6c3140c' +b2sums=('b401dd06633cf78c988eecd8c736d1dd8a264a4e0399eccb958cccca2fa8e4dce0bfab5a263a3f495885cc2a16acee6b6e7da7a6725fab38f6ffd2e6f3213215' 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729' '329d247959ba2862a7e55714ebc59886c62b840f1cab9d27b7b74b2379789f0da607b08c22b5ceddf6d2487761f6cba350d6e0997d53c0f2642e81d7da3c4c8b') export KBUILD_BUILD_HOST=archlinux From 57a74f932aa46232be5498e26bb36a3557c77cbf Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Mon, 25 Dec 2023 23:13:37 +0100 Subject: [PATCH 10/37] bump kernel to 6.6-14 and m1n1 to 1.4.11 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 6 +++--- m1n1/PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 60a11a5..ddde87e 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,7 +5,7 @@ buildarch=8 _rcver=6.6 #_rcrel=3 -_asahirel=13 +_asahirel=14 pkgrel=1 _m1n1_version=1.4.9 @@ -30,10 +30,10 @@ source=( config # the main kernel config file config.edge # overrides for linux-asahi-edge ) -sha256sums=('fb344f9c6ded5045be9d3c368b368dc9cb4af97d517423b2e48a319a0d929f1c' +sha256sums=('b633c6055dbbbd56b6af555afa07c8c68ba27d778c4be1b630c6e56fc6da73c2' 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817' 'a30d8bfd24b9cdd45755bf5eda9ba876195a860527552d1e704516702e792872') -b2sums=('b401dd06633cf78c988eecd8c736d1dd8a264a4e0399eccb958cccca2fa8e4dce0bfab5a263a3f495885cc2a16acee6b6e7da7a6725fab38f6ffd2e6f3213215' +b2sums=('5ead418fa294d5015af560b4249324aa2531a2aa34db214be4d09ab9cef602b6ffdbee7a45a21329b35a9df96bbaf7312b8b311a6461066af33ceafdb1aabeb7' 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729' '329d247959ba2862a7e55714ebc59886c62b840f1cab9d27b7b74b2379789f0da607b08c22b5ceddf6d2487761f6cba350d6e0997d53c0f2642e81d7da3c4c8b') export KBUILD_BUILD_HOST=archlinux diff --git a/m1n1/PKGBUILD b/m1n1/PKGBUILD index fa8a531..b629aea 100644 --- a/m1n1/PKGBUILD +++ b/m1n1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Hector Martin pkgname=m1n1 -pkgver=1.4.9 +pkgver=1.4.11 pkgrel=1 pkgdesc='Asahi Linux bootloader' _artwork_commit_id=35626c31f5c5a8a884aaff93f864795026495742 @@ -17,9 +17,9 @@ source=( "m1n1-${_m1n1_commit_id}.tar.gz::https://github.com/AsahiLinux/m1n1/archive/${_m1n1_commit_id}.tar.gz" ) sha256sums=('ffa129b5cae8debd4ffd97f7f1ac7f571c7ba4679793cd138918c2ae76a7103d' - '02881214610b60e865b3765a0962240047f369f6ae66f7a41142debf76fbe9a0') + '227644907d84955b9421a53717b3ebb40dfa1d90c7742e284632547803844d8e') b2sums=('26e9668f7c7393fec24b53b184ea0eabed4f46479c1aab26728d01c179091683cc4387ff83796bdcbb289376236faf9f651197b9fbba51e52540e58ebdc8bcc5' - '71694dbfbb73fc49eb3edad98b805370fd6668f23766121d5691c9f57cdba18212f7876f830a2a12617be5a33cfad94f613993ba1206dcfe91d9037c97580acf') + '84f311b5da34cb0502103fd439a22ef068db7c77d25f6e4e2de539d23ed28d3468a554fae1905b99d09dc27391a797f6cbf88efbf1b4720dad13fe7b00bbe551') prepare() { rm -rf "${srcdir}/$_m1n1_srcname"/artwork From 31950b1336c261fb9cb0746c269e28be592fae40 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Wed, 24 Jan 2024 23:08:30 +0100 Subject: [PATCH 11/37] remove -edge kernel Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 40 +++++----------------------------------- linux-asahi/config.edge | 1 - 2 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 linux-asahi/config.edge diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index ddde87e..373aeab 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -28,14 +28,11 @@ options=('!strip') source=( https://github.com/AsahiLinux/linux/archive/${_commit_id}.tar.gz config # the main kernel config file - config.edge # overrides for linux-asahi-edge ) sha256sums=('b633c6055dbbbd56b6af555afa07c8c68ba27d778c4be1b630c6e56fc6da73c2' - 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817' - 'a30d8bfd24b9cdd45755bf5eda9ba876195a860527552d1e704516702e792872') + 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817') b2sums=('5ead418fa294d5015af560b4249324aa2531a2aa34db214be4d09ab9cef602b6ffdbee7a45a21329b35a9df96bbaf7312b8b311a6461066af33ceafdb1aabeb7' - 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729' - '329d247959ba2862a7e55714ebc59886c62b840f1cab9d27b7b74b2379789f0da607b08c22b5ceddf6d2487761f6cba350d6e0997d53c0f2642e81d7da3c4c8b') + 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" @@ -56,7 +53,7 @@ prepare() { done echo "Creating build directories..." - mkdir -p build/base build/edge + mkdir -p build/base echo "Setting config (base)..." cp ../config build/base/.config @@ -64,11 +61,6 @@ prepare() { diff -u ../config build/base/.config || : make -s kernelrelease O=$PWD/build/base > build/base/version - echo "Setting config (edge)..." - cat build/base/.config ../config.edge > build/edge/.config - make olddefconfig prepare O=$PWD/build/edge - make -s kernelrelease O=$PWD/build/edge > build/edge/version - echo "Prepared $pkgbase version $( Date: Wed, 24 Jan 2024 23:08:55 +0100 Subject: [PATCH 12/37] bump m1n1 dep Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 373aeab..11b2ba3 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -8,7 +8,7 @@ _rcver=6.6 _asahirel=14 pkgrel=1 -_m1n1_version=1.4.9 +_m1n1_version=1.4.11 pkgbase=linux-asahi #_commit_id=asahi-${_nextver}-${_asahirel} From a2399b2cc25bb74aceb1c08354b4c1a80ad0faa9 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Thu, 15 Feb 2024 18:10:35 +0100 Subject: [PATCH 13/37] bump kernel to 6.6-15 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 11b2ba3..a0d72f0 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,7 +5,7 @@ buildarch=8 _rcver=6.6 #_rcrel=3 -_asahirel=14 +_asahirel=15 pkgrel=1 _m1n1_version=1.4.11 @@ -29,9 +29,9 @@ source=( https://github.com/AsahiLinux/linux/archive/${_commit_id}.tar.gz config # the main kernel config file ) -sha256sums=('b633c6055dbbbd56b6af555afa07c8c68ba27d778c4be1b630c6e56fc6da73c2' +sha256sums=('1d8d82dcfd87fb7153d81f52d01789be226c79637898de2b7407019ec7d35c8e' 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817') -b2sums=('5ead418fa294d5015af560b4249324aa2531a2aa34db214be4d09ab9cef602b6ffdbee7a45a21329b35a9df96bbaf7312b8b311a6461066af33ceafdb1aabeb7' +b2sums=('f0cdce0421bb8637d52e82d2ff0b7e07c29e828783c7cb8733f1582916be81bfd14a0b6a98f51f633ee9da3d10aa1fff6b27c5779bd9fa55c1d04615173d6d4b' 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase @@ -72,7 +72,7 @@ build() { _package_kernel() { pkgdesc="The $pkgdesc kernel and modules" - depends=(coreutils kmod initramfs $2 "m1n1>=$_m1n1_version") + depends=(coreutils kmod initramfs $2 "m1n1>=$_m1n1_version" "mesa-asahi-edge>=24.1.0_pre20240214-1") optdepends=('crda: to set the correct wireless channels of your country' 'linux-firmware: firmware images needed for some devices') provides=(WIREGUARD-MODULE linux=${pkgver}) From 92c74aa2b033cee61a590d358b4d1b6d975fe38d Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Fri, 12 Apr 2024 09:06:07 +0200 Subject: [PATCH 14/37] bump kernel to 6.6-16 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index a0d72f0..a178017 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,7 +5,7 @@ buildarch=8 _rcver=6.6 #_rcrel=3 -_asahirel=15 +_asahirel=16 pkgrel=1 _m1n1_version=1.4.11 @@ -29,9 +29,9 @@ source=( https://github.com/AsahiLinux/linux/archive/${_commit_id}.tar.gz config # the main kernel config file ) -sha256sums=('1d8d82dcfd87fb7153d81f52d01789be226c79637898de2b7407019ec7d35c8e' +sha256sums=('e5a6f08681e8514c6d1cbd06c5637b20eb16b330dac4597006742ab304d64a15' 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817') -b2sums=('f0cdce0421bb8637d52e82d2ff0b7e07c29e828783c7cb8733f1582916be81bfd14a0b6a98f51f633ee9da3d10aa1fff6b27c5779bd9fa55c1d04615173d6d4b' +b2sums=('e8f90373fe3cfb0ee8824158c59d548af05d1e68626715a65dcf086b35cfe7f4d44b184f02bbfad33474040b86f488e4fa99c8886ae329cf138933161658f94c' 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase From 318d117b86bfa75e2dafbba307564f928aada67b Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Sun, 5 May 2024 21:11:37 +0200 Subject: [PATCH 15/37] bump kernel to 6.8.9 and m1n1 to 1.4.12 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 8 ++++---- m1n1/PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index a178017..169d48a 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -3,9 +3,9 @@ buildarch=8 -_rcver=6.6 +_rcver=6.8.9 #_rcrel=3 -_asahirel=16 +_asahirel=1 pkgrel=1 _m1n1_version=1.4.11 @@ -29,9 +29,9 @@ source=( https://github.com/AsahiLinux/linux/archive/${_commit_id}.tar.gz config # the main kernel config file ) -sha256sums=('e5a6f08681e8514c6d1cbd06c5637b20eb16b330dac4597006742ab304d64a15' +sha256sums=('0d7ed4c8dfebb2001c6c8b0010c8d3d3f5fc6801ca38bb029b9d504fa6aa4ac4' 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817') -b2sums=('e8f90373fe3cfb0ee8824158c59d548af05d1e68626715a65dcf086b35cfe7f4d44b184f02bbfad33474040b86f488e4fa99c8886ae329cf138933161658f94c' +b2sums=('16624f93eabdf1ff40a420cfb7108e13c7f5f1ccba88c84b2a8c9057d1b22b8e17e0c8f33381f41e0098772843e8b1b47ceae521e2a2760d173850a5d0687ce0' 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase diff --git a/m1n1/PKGBUILD b/m1n1/PKGBUILD index b629aea..fb96873 100644 --- a/m1n1/PKGBUILD +++ b/m1n1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Hector Martin pkgname=m1n1 -pkgver=1.4.11 +pkgver=1.4.12 pkgrel=1 pkgdesc='Asahi Linux bootloader' _artwork_commit_id=35626c31f5c5a8a884aaff93f864795026495742 @@ -17,9 +17,9 @@ source=( "m1n1-${_m1n1_commit_id}.tar.gz::https://github.com/AsahiLinux/m1n1/archive/${_m1n1_commit_id}.tar.gz" ) sha256sums=('ffa129b5cae8debd4ffd97f7f1ac7f571c7ba4679793cd138918c2ae76a7103d' - '227644907d84955b9421a53717b3ebb40dfa1d90c7742e284632547803844d8e') + '1e96b0c1c75e5af37031477c7dfe1a472fa2ec9f383a4bd7a8f7891b86646ccb') b2sums=('26e9668f7c7393fec24b53b184ea0eabed4f46479c1aab26728d01c179091683cc4387ff83796bdcbb289376236faf9f651197b9fbba51e52540e58ebdc8bcc5' - '84f311b5da34cb0502103fd439a22ef068db7c77d25f6e4e2de539d23ed28d3468a554fae1905b99d09dc27391a797f6cbf88efbf1b4720dad13fe7b00bbe551') + '2c192294daaeb9371e98d1cda596e7fbadc3cb35021fbc527f70a1a8076f84afe391190a620deb007e837f1a97b1fe9ca36bc194d1173debaff3c9f269a3f4f9') prepare() { rm -rf "${srcdir}/$_m1n1_srcname"/artwork From e85991afd97303ed80e7e07b97d8f8da4717667d Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Sun, 5 May 2024 21:20:04 +0200 Subject: [PATCH 16/37] bump u-boot Signed-off-by: Jos Dehaes --- uboot-asahi/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/uboot-asahi/PKGBUILD b/uboot-asahi/PKGBUILD index c91396b..39ddb86 100644 --- a/uboot-asahi/PKGBUILD +++ b/uboot-asahi/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Hector Martin pkgname=uboot-asahi -_ver=2023.07.02 -_asahirel=3 +_ver=2024.04 +_asahirel=1 pkgver=${_ver}.asahi${_asahirel} pkgrel=1 @@ -16,8 +16,8 @@ makedepends=( bc imagemagick ) source=( "u-boot-${_commit_id}.tar.gz::https://github.com/AsahiLinux/u-boot/archive/${_commit_id}.tar.gz" ) -sha256sums=('67c08af75338b56b3922653943335a99c1cf3075c56c3728f5f53fd14ac52d9f') -b2sums=('4374f46d0ac8c57bf2f8f75092b77fa66b10430f0936cffa56f6b38c4a3d81cf34a677da9bf207f1365de4b7104e89624b88d17605828acbe70a2021aad8d872') +sha256sums=('40d8fb513ba332c798510e003e9d63ce6a392e2777398ec260f20678502b3a71') +b2sums=('42325ebadcebda56b38f6abce213ee7bbdce73101498e90a44cbe354e1af61cfc8285f5290db713431887d60b4750cfacd2eafa7606ec423688af8c01903276c') prepare() { cd "${srcdir}/$_srcname" From f32fafd55a19c4e0875fcf9a625974233c08ee55 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Mon, 13 May 2024 13:46:24 +0200 Subject: [PATCH 17/37] update config built with GCC Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 6 +- linux-asahi/config | 408 +++++++++++++++++++++++++++---------------- 2 files changed, 264 insertions(+), 150 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 169d48a..e9e991e 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -6,7 +6,7 @@ buildarch=8 _rcver=6.8.9 #_rcrel=3 _asahirel=1 -pkgrel=1 +pkgrel=2 _m1n1_version=1.4.11 @@ -30,9 +30,9 @@ source=( config # the main kernel config file ) sha256sums=('0d7ed4c8dfebb2001c6c8b0010c8d3d3f5fc6801ca38bb029b9d504fa6aa4ac4' - 'adbefe442c323be82bc534702efccbf7dcd6720dad926af93435e69b261e6817') + '9432e63b6c631273d7ef2040703c4fd70f99f16261168dc4e1a9aae2fec2ce99') b2sums=('16624f93eabdf1ff40a420cfb7108e13c7f5f1ccba88c84b2a8c9057d1b22b8e17e0c8f33381f41e0098772843e8b1b47ceae521e2a2760d173850a5d0687ce0' - 'fe5b2ed51dc5a08c32487d85cf24eef9f76c1dd5865ad8b48f5fc49c33b7388ea8c346f357a931bcd48d4028dff73cde839e3450c2b07178f0b86934b70df729') + '4353850ca1b12cd8eb8176b83973274ef802ac5625ad04918d0d90212305b750051cd93b286e45db723aaddd2421cecd133bbb94ae7c5ee56b2d5d5d0d2e072d') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" diff --git a/linux-asahi/config b/linux-asahi/config index 2f9c181..39da3d2 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -1,26 +1,24 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.5.0 Kernel Configuration -# -CONFIG_CC_VERSION_TEXT="clang version 16.0.6" -CONFIG_GCC_VERSION=0 -CONFIG_CC_IS_CLANG=y -CONFIG_CLANG_VERSION=160006 -CONFIG_AS_IS_LLVM=y -CONFIG_AS_VERSION=160006 -CONFIG_LD_VERSION=0 -CONFIG_LD_IS_LLD=y -CONFIG_LLD_VERSION=160006 +# Linux/arm64 6.8.9 Kernel Configuration +# +CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240507" +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=140101 +CONFIG_CLANG_VERSION=0 +CONFIG_AS_IS_GNU=y +CONFIG_AS_VERSION=24200 +CONFIG_LD_IS_BFD=y +CONFIG_LD_VERSION=24200 +CONFIG_LLD_VERSION=0 CONFIG_RUST_IS_AVAILABLE=y CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y -CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=125 -CONFIG_CONSTRUCTORS=y +CONFIG_PAHOLE_VERSION=126 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -103,7 +101,6 @@ CONFIG_BPF_JIT=y # CONFIG_BPF_JIT_ALWAYS_ON is not set CONFIG_BPF_JIT_DEFAULT_ON=y # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set -CONFIG_USERMODE_DRIVER=y # CONFIG_BPF_PRELOAD is not set # end of BPF subsystem @@ -168,9 +165,13 @@ CONFIG_GENERIC_SCHED_CLOCK=y # end of Scheduler features CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y -CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC10_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y +CONFIG_GCC_NO_STRINGOP_OVERFLOW=y +CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y @@ -247,19 +248,18 @@ CONFIG_AIO=y CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y CONFIG_MEMBARRIER=y +CONFIG_KCMP=y +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +CONFIG_CACHESTAT_SYSCALL=y +# CONFIG_PC104 is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -CONFIG_KCMP=y -CONFIG_RSEQ=y -CONFIG_CACHESTAT_SYSCALL=y -# CONFIG_DEBUG_RSEQ is not set -# CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y -# CONFIG_PC104 is not set # # Kernel Performance Events And Counters @@ -271,12 +271,24 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_RUST=y -CONFIG_RUSTC_VERSION_TEXT="rustc 1.68.2 (9eb3afe9e 2023-03-27)" -CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.66.0" +CONFIG_RUSTC_VERSION_TEXT="rustc 1.76.0 (07dca489a 2024-02-04)" +CONFIG_RUSTC_LLVM_VERSION_TEXT="17.0.6" +CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.65.1" + +# +# Kexec and crash features +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +# CONFIG_KEXEC is not set +CONFIG_KEXEC_FILE=y +# CONFIG_KEXEC_SIG is not set +# CONFIG_CRASH_DUMP is not set +# end of Kexec and crash features # end of General setup CONFIG_ARM64=y -CONFIG_CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_64BIT=y CONFIG_MMU=y CONFIG_ARM64_PAGE_SHIFT=14 @@ -294,7 +306,6 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y CONFIG_SMP=y CONFIG_KERNEL_MODE_NEON=y CONFIG_FIX_EARLYCON_MEM=y @@ -326,6 +337,7 @@ CONFIG_ARCH_APPLE=y # CONFIG_ARCH_NXP is not set # CONFIG_ARCH_MA35 is not set # CONFIG_ARCH_NPCM is not set +# CONFIG_ARCH_PENSANDO is not set # CONFIG_ARCH_QCOM is not set # CONFIG_ARCH_REALTEK is not set # CONFIG_ARCH_RENESAS is not set @@ -378,6 +390,9 @@ CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y # CONFIG_ARM64_ERRATUM_2441009 is not set # CONFIG_ARM64_ERRATUM_2457168 is not set # CONFIG_ARM64_ERRATUM_2645198 is not set +CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y +CONFIG_ARM64_ERRATUM_2966298=y +CONFIG_ARM64_ERRATUM_3117295=y # CONFIG_CAVIUM_ERRATUM_22375 is not set # CONFIG_CAVIUM_ERRATUM_23154 is not set # CONFIG_CAVIUM_ERRATUM_27456 is not set @@ -422,9 +437,14 @@ CONFIG_HW_PERF_EVENTS=y CONFIG_CC_HAVE_SHADOW_CALL_STACK=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_KEXEC_FILE=y -# CONFIG_KEXEC_SIG is not set -# CONFIG_CRASH_DUMP is not set +CONFIG_ARCH_SUPPORTS_KEXEC=y +CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y +CONFIG_ARCH_SELECTS_KEXEC_FILE=y +CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y +CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y +CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y +CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y +CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y CONFIG_TRANS_TABLE=y # CONFIG_XEN is not set CONFIG_ARCH_FORCE_MAX_ORDER=11 @@ -440,7 +460,6 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y -CONFIG_AS_HAS_LDAPR=y CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y @@ -465,6 +484,7 @@ CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y CONFIG_AS_HAS_ARMV8_3=y CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y +CONFIG_AS_HAS_LDAPR=y # end of ARMv8.3 architectural features # @@ -480,7 +500,6 @@ CONFIG_ARM64_TLB_RANGE=y # CONFIG_AS_HAS_ARMV8_5=y CONFIG_ARM64_BTI=y -CONFIG_ARM64_BTI_KERNEL=y CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y CONFIG_ARM64_E0PD=y CONFIG_ARM64_AS_HAS_MTE=y @@ -516,14 +535,24 @@ CONFIG_DMI=y # Power management options # CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND_SKIP_SYNC is not set # CONFIG_HIBERNATION is not set +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_USERSPACE_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set CONFIG_PM=y CONFIG_PM_DEBUG=y # CONFIG_PM_ADVANCED_DEBUG is not set +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_SLEEP_DEBUG=y # CONFIG_DPM_WATCHDOG is not set CONFIG_PM_CLK=y CONFIG_PM_GENERIC_DOMAINS=y # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +CONFIG_PM_GENERIC_DOMAINS_SLEEP=y CONFIG_PM_GENERIC_DOMAINS_OF=y CONFIG_CPU_PM=y CONFIG_ENERGY_MODEL=y @@ -586,34 +615,31 @@ CONFIG_ARM_APPLE_SOC_CPUFREQ=m CONFIG_ARCH_SUPPORTS_ACPI=y # CONFIG_ACPI is not set -CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_HAVE_KVM=y +CONFIG_KVM_COMMON=y CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_DIRTY_RING=y CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y -CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_MMIO=y CONFIG_HAVE_KVM_MSI=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y -CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y CONFIG_HAVE_KVM_IRQ_BYPASS=y CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y +CONFIG_KVM_GENERIC_MMU_NOTIFIER=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y # CONFIG_NVHE_EL2_DEBUG is not set +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options # -CONFIG_CRASH_CORE=y -CONFIG_KEXEC_CORE=y CONFIG_ARCH_HAS_SUBPAGE_FAULTS=y CONFIG_HOTPLUG_CORE_SYNC=y CONFIG_HOTPLUG_CORE_SYNC_DEAD=y @@ -671,12 +697,8 @@ CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y # CONFIG_SHADOW_CALL_STACK is not set CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y -CONFIG_HAS_LTO_CLANG=y CONFIG_LTO_NONE=y -# CONFIG_LTO_CLANG_FULL is not set -# CONFIG_LTO_CLANG_THIN is not set CONFIG_ARCH_SUPPORTS_CFI_CLANG=y -# CONFIG_CFI_CLANG is not set CONFIG_HAVE_CONTEXT_TRACKING_USER=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -712,13 +734,13 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y -CONFIG_RELR=y CONFIG_HAVE_PREEMPT_DYNAMIC=y CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y +CONFIG_ARCH_HAS_HW_PTE_YOUNG=y # # GCOV-based kernel profiling @@ -728,6 +750,8 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y +CONFIG_GCC_PLUGINS=y +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT=4 # end of General architecture-dependent options @@ -762,6 +786,7 @@ CONFIG_BLK_ICQ=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY_T10=y +CONFIG_BLK_DEV_WRITE_MOUNTED=y CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_DEV_THROTTLING_LOW is not set @@ -856,6 +881,7 @@ CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set # CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set +# CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -874,9 +900,8 @@ CONFIG_ZSMALLOC=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # -# SLAB allocator options +# Slab allocator options # -# CONFIG_SLAB_DEPRECATED is not set CONFIG_SLUB=y # CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y @@ -884,7 +909,8 @@ CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB_FREELIST_HARDENED is not set # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y -# end of SLAB allocator options +# CONFIG_RANDOM_KMALLOC_CACHES is not set +# end of Slab allocator options # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set # CONFIG_COMPAT_BRK is not set @@ -899,6 +925,7 @@ CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y # CONFIG_MEMORY_HOTPLUG is not set +CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_MEMORY_BALLOON=y @@ -909,6 +936,7 @@ CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_CONTIG_ALLOC=y +CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y @@ -916,7 +944,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y # CONFIG_MEMORY_FAILURE is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set -CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set CONFIG_CMA_DEBUGFS=y @@ -938,6 +965,7 @@ CONFIG_VM_EVENT_COUNTERS=y # CONFIG_GUP_TEST is not set # CONFIG_DMAPOOL_TEST is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y # CONFIG_ANON_VMA_NAME is not set # CONFIG_USERFAULTFD is not set @@ -956,6 +984,7 @@ CONFIG_LOCK_MM_AND_FIND_VMA=y CONFIG_NET=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y +CONFIG_NET_XGRESS=y CONFIG_NET_REDIRECT=y CONFIG_SKB_EXTENSIONS=y @@ -1042,6 +1071,8 @@ CONFIG_TCP_CONG_BBR=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_SIGPOOL=y +# CONFIG_TCP_AO is not set CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y @@ -1432,8 +1463,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_NFLOG=m -CONFIG_BPFILTER=y -CONFIG_BPFILTER_UMH=m CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m @@ -1517,9 +1546,6 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_LLC=m # CONFIG_LLC2 is not set CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_PHONET is not set @@ -1718,7 +1744,6 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m -CONFIG_BT_HS=y CONFIG_BT_LE=y CONFIG_BT_LE_L2CAP_ECRED=y CONFIG_BT_6LOWPAN=m @@ -1780,7 +1805,6 @@ CONFIG_WIRELESS=y CONFIG_WIRELESS_EXT=y CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set @@ -1792,7 +1816,6 @@ CONFIG_CFG80211_DEFAULT_PS=y CONFIG_CFG80211_DEBUGFS=y CONFIG_CFG80211_CRDA_SUPPORT=y CONFIG_CFG80211_WEXT=y -CONFIG_CFG80211_WEXT_EXPORT=y CONFIG_LIB80211=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m @@ -1903,6 +1926,7 @@ CONFIG_PCI_IOV=y CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y CONFIG_PCI_LABEL=y +# CONFIG_PCI_DYNAMIC_OF_NODES is not set # CONFIG_PCIE_BUS_TUNE_OFF is not set CONFIG_PCIE_BUS_DEFAULT=y # CONFIG_PCIE_BUS_SAFE is not set @@ -1933,7 +1957,6 @@ CONFIG_PCI_HOST_COMMON=m # Cadence-based PCIe controllers # # CONFIG_PCIE_CADENCE_PLAT_HOST is not set -# CONFIG_PCI_J721E_HOST is not set # end of Cadence-based PCIe controllers # @@ -1989,6 +2012,7 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_COMPRESS=y CONFIG_FW_LOADER_COMPRESS_XZ=y CONFIG_FW_LOADER_COMPRESS_ZSTD=y +CONFIG_FW_CACHE=y # CONFIG_FW_UPLOAD is not set # end of Firmware loader @@ -1999,6 +2023,7 @@ CONFIG_DEV_COREDUMP=y CONFIG_DEBUG_DEVRES=y # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set +CONFIG_GENERIC_CPU_DEVICES=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y @@ -2016,13 +2041,17 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y # # Bus devices # -# CONFIG_BRCMSTB_GISB_ARB is not set # CONFIG_MOXTET is not set # CONFIG_VEXPRESS_CONFIG is not set # CONFIG_MHI_BUS is not set # CONFIG_MHI_BUS_EP is not set # end of Bus devices +# +# Cache Drivers +# +# end of Cache Drivers + CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y @@ -2068,6 +2097,12 @@ CONFIG_EFI_EARLYCON=y CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_PSCI_CHECKER is not set + +# +# Qualcomm firmware drivers +# +# end of Qualcomm firmware drivers + CONFIG_HAVE_ARM_SMCCC=y CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y # CONFIG_ARM_SMCCC_SOC_ID is not set @@ -2090,7 +2125,6 @@ CONFIG_MTD=y # # Partition parsers # -# CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_CMDLINE_PARTS is not set CONFIG_MTD_OF_PARTS=m # CONFIG_MTD_AFS_PARTS is not set @@ -2221,6 +2255,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y # CONFIG_ZRAM_DEF_COMP_842 is not set CONFIG_ZRAM_DEF_COMP="lzo-rle" # CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set # CONFIG_ZRAM_MULTI_COMP is not set CONFIG_BLK_DEV_LOOP=m @@ -2247,7 +2282,7 @@ CONFIG_NVME_VERBOSE_ERRORS=y # CONFIG_NVME_HWMON is not set # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set -# CONFIG_NVME_AUTH is not set +# CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_APPLE=m # CONFIG_NVME_TARGET is not set # end of NVME Support @@ -2280,6 +2315,7 @@ CONFIG_ENCLOSURE_SERVICES=m # CONFIG_HISI_HIKEY_USB is not set # CONFIG_OPEN_DICE is not set # CONFIG_VCPU_STALL_DETECTOR is not set +# CONFIG_NSM is not set # CONFIG_C2PORT is not set # @@ -2287,7 +2323,6 @@ CONFIG_ENCLOSURE_SERVICES=m # CONFIG_EEPROM_AT24=m # CONFIG_EEPROM_AT25 is not set -# CONFIG_EEPROM_LEGACY is not set # CONFIG_EEPROM_MAX6875 is not set CONFIG_EEPROM_93CX6=m # CONFIG_EEPROM_93XX46 is not set @@ -2424,17 +2459,14 @@ CONFIG_SCSI_DH_ALUA=m CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y -CONFIG_MD_LINEAR=m +CONFIG_MD_BITMAP_FILE=y CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m CONFIG_MD_CLUSTER=m CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set # CONFIG_BCACHE_ASYNC_REGISTRATION is not set CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=y @@ -2520,6 +2552,7 @@ CONFIG_GENEVE=m # CONFIG_MACSEC is not set CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y +# CONFIG_NETCONSOLE_EXTENDED_LOG is not set CONFIG_NETPOLL=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_TUN=m @@ -2528,6 +2561,7 @@ CONFIG_TAP=m CONFIG_VETH=m CONFIG_VIRTIO_NET=m CONFIG_NLMON=m +# CONFIG_NETKIT is not set CONFIG_NET_VRF=m # CONFIG_VSOCKMON is not set # CONFIG_ARCNET is not set @@ -2658,6 +2692,7 @@ CONFIG_SWPHY=y CONFIG_LED_TRIGGER_PHY=y CONFIG_PHYLIB_LEDS=y CONFIG_FIXED_PHY=y +# CONFIG_RUST_PHYLIB_ABSTRACTIONS is not set CONFIG_SFP=m # @@ -2684,6 +2719,7 @@ CONFIG_LXT_PHY=m CONFIG_LSI_ET1011C_PHY=m CONFIG_MARVELL_PHY=m CONFIG_MARVELL_10G_PHY=m +# CONFIG_MARVELL_88Q2XXX_PHY is not set # CONFIG_MARVELL_88X2222_PHY is not set # CONFIG_MAXLINEAR_GPHY is not set # CONFIG_MEDIATEK_GE_PHY is not set @@ -2712,6 +2748,7 @@ CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set # CONFIG_DP83TD510_PHY is not set +# CONFIG_DP83TG720_PHY is not set CONFIG_VITESSE_PHY=m # CONFIG_XILINX_GMII2RGMII is not set # CONFIG_MICREL_KS8995MA is not set @@ -2854,7 +2891,6 @@ CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH11K is not set # CONFIG_ATH12K is not set CONFIG_WLAN_VENDOR_ATMEL=y -# CONFIG_ATMEL is not set CONFIG_AT76C50X_USB=m CONFIG_WLAN_VENDOR_BROADCOM=y # CONFIG_B43 is not set @@ -2869,8 +2905,6 @@ CONFIG_BRCMFMAC_USB=y CONFIG_BRCMFMAC_PCIE=y # CONFIG_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set -CONFIG_WLAN_VENDOR_CISCO=y -# CONFIG_AIRO is not set CONFIG_WLAN_VENDOR_INTEL=y # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set @@ -2878,15 +2912,6 @@ CONFIG_WLAN_VENDOR_INTEL=y # CONFIG_IWL3945 is not set # CONFIG_IWLWIFI is not set CONFIG_WLAN_VENDOR_INTERSIL=y -# CONFIG_HOSTAP is not set -CONFIG_HERMES=m -CONFIG_HERMES_PRISM=y -CONFIG_HERMES_CACHE_FW_ON_INIT=y -# CONFIG_PLX_HERMES is not set -# CONFIG_TMD_HERMES is not set -# CONFIG_NORTEL_HERMES is not set -# CONFIG_PCI_HERMES is not set -CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m # CONFIG_P54_PCI is not set @@ -2932,6 +2957,8 @@ CONFIG_MT7663U=m # CONFIG_MT7921S is not set # CONFIG_MT7921U is not set # CONFIG_MT7996E is not set +# CONFIG_MT7925E is not set +# CONFIG_MT7925U is not set # CONFIG_WLAN_VENDOR_MICROCHIP is not set # CONFIG_WLAN_VENDOR_PURELIFI is not set CONFIG_WLAN_VENDOR_RALINK=y @@ -2990,11 +3017,9 @@ CONFIG_WLAN_VENDOR_SILABS=y # CONFIG_WLAN_VENDOR_ST is not set # CONFIG_WLAN_VENDOR_TI is not set CONFIG_WLAN_VENDOR_ZYDAS=y -CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set # CONFIG_WLAN_VENDOR_QUANTENNA is not set -CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_MAC80211_HWSIM is not set # CONFIG_VIRT_WIFI is not set # CONFIG_WAN is not set @@ -3116,6 +3141,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_JOYSTICK_QWIIC is not set # CONFIG_JOYSTICK_FSIA6B is not set # CONFIG_JOYSTICK_SENSEHAT is not set +# CONFIG_JOYSTICK_SEESAW is not set CONFIG_INPUT_TABLET=y CONFIG_TABLET_USB_ACECAD=m CONFIG_TABLET_USB_AIPTEK=m @@ -3173,6 +3199,7 @@ CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y @@ -3218,7 +3245,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set -# CONFIG_SYNCLINK_GT is not set # CONFIG_N_HDLC is not set # CONFIG_N_GSM is not set CONFIG_NOZOMI=m @@ -3414,6 +3440,7 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=m CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set # CONFIG_PTP_1588_CLOCK_IDTCM is not set +# CONFIG_PTP_1588_CLOCK_MOCK is not set # end of PTP clock support CONFIG_PINCTRL=y @@ -3471,6 +3498,7 @@ CONFIG_GPIO_CDEV_V1=y # # CONFIG_GPIO_ADNP is not set # CONFIG_GPIO_FXL6408 is not set +# CONFIG_GPIO_DS4520 is not set # CONFIG_GPIO_GW_PLD is not set # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set @@ -3523,7 +3551,6 @@ CONFIG_GPIO_MACSMC=m # CONFIG_W1 is not set CONFIG_POWER_RESET=y -# CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_GPIO is not set # CONFIG_POWER_RESET_GPIO_RESTART is not set CONFIG_POWER_RESET_MACSMC=m @@ -3550,7 +3577,6 @@ CONFIG_POWER_SUPPLY_HWMON=y # CONFIG_CHARGER_SBS is not set # CONFIG_MANAGER_SBS is not set # CONFIG_BATTERY_BQ27XXX is not set -# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set @@ -3579,6 +3605,7 @@ CONFIG_POWER_SUPPLY_HWMON=y # CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_BD99954 is not set # CONFIG_BATTERY_UG3105 is not set +# CONFIG_FUEL_GAUGE_MM8013 is not set CONFIG_CHARGER_MACSMC=m CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3617,20 +3644,24 @@ CONFIG_HWMON=y # CONFIG_SENSORS_F71882FG is not set # CONFIG_SENSORS_F75375S is not set # CONFIG_SENSORS_FTSTEUTATES is not set +# CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_G760A is not set # CONFIG_SENSORS_G762 is not set # CONFIG_SENSORS_GPIO_FAN is not set # CONFIG_SENSORS_HIH6130 is not set +# CONFIG_SENSORS_HS3001 is not set # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_POWERZ is not set # CONFIG_SENSORS_POWR1220 is not set # CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LTC2945 is not set # CONFIG_SENSORS_LTC2947_I2C is not set # CONFIG_SENSORS_LTC2947_SPI is not set # CONFIG_SENSORS_LTC2990 is not set +# CONFIG_SENSORS_LTC2991 is not set # CONFIG_SENSORS_LTC2992 is not set # CONFIG_SENSORS_LTC4151 is not set # CONFIG_SENSORS_LTC4215 is not set @@ -3710,7 +3741,6 @@ CONFIG_HWMON=y # CONFIG_SENSORS_SCH5627 is not set # CONFIG_SENSORS_SCH5636 is not set # CONFIG_SENSORS_STTS751 is not set -# CONFIG_SENSORS_SMM665 is not set # CONFIG_SENSORS_ADC128D818 is not set # CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7871 is not set @@ -3744,6 +3774,7 @@ CONFIG_HWMON=y CONFIG_THERMAL=y # CONFIG_THERMAL_NETLINK is not set # CONFIG_THERMAL_STATISTICS is not set +# CONFIG_THERMAL_DEBUGFS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y @@ -3827,6 +3858,7 @@ CONFIG_MFD_APPLE_SPMI_PMU=m # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_BD9571MWV is not set # CONFIG_MFD_AXP20X_I2C is not set +# CONFIG_MFD_CS42L43_I2C is not set # CONFIG_MFD_MADERA is not set # CONFIG_MFD_MAX5970 is not set # CONFIG_PMIC_DA903X is not set @@ -3890,7 +3922,6 @@ CONFIG_MFD_SIMPLE_MFD_SPMI=m # CONFIG_MFD_SKY81452 is not set # CONFIG_MFD_STMPE is not set CONFIG_MFD_SYSCON=y -# CONFIG_MFD_TI_AM335X_TSCADC is not set # CONFIG_MFD_LP3943 is not set # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_TI_LMU is not set @@ -3944,9 +3975,11 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_NETLINK_EVENTS is not set # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set +# CONFIG_REGULATOR_AW37503 is not set # CONFIG_REGULATOR_DA9121 is not set # CONFIG_REGULATOR_DA9210 is not set # CONFIG_REGULATOR_DA9211 is not set @@ -3962,6 +3995,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_LTC3589 is not set # CONFIG_REGULATOR_LTC3676 is not set # CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX77503 is not set +# CONFIG_REGULATOR_MAX77857 is not set # CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set # CONFIG_REGULATOR_MAX8893 is not set @@ -3999,6 +4034,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_RTQ2134 is not set # CONFIG_REGULATOR_RTMV20 is not set # CONFIG_REGULATOR_RTQ6752 is not set +# CONFIG_REGULATOR_RTQ2208 is not set # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set @@ -4086,6 +4122,7 @@ CONFIG_DVB_CORE=m # Video4Linux options # CONFIG_VIDEO_V4L2_I2C=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m @@ -4355,6 +4392,10 @@ CONFIG_VIDEO_APPLE_ISP=m # Microchip Technology, Inc. media platform drivers # +# +# Nuvoton media platform drivers +# + # # NVidia media platform drivers # @@ -4439,11 +4480,11 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y +# CONFIG_VIDEO_ALVIUM_CSI2 is not set # CONFIG_VIDEO_AR0521 is not set +# CONFIG_VIDEO_GC0308 is not set +# CONFIG_VIDEO_GC2145 is not set # CONFIG_VIDEO_HI556 is not set # CONFIG_VIDEO_HI846 is not set # CONFIG_VIDEO_HI847 is not set @@ -4462,6 +4503,7 @@ CONFIG_VIDEO_IR_I2C=m # CONFIG_VIDEO_IMX415 is not set # CONFIG_VIDEO_MT9M001 is not set # CONFIG_VIDEO_MT9M111 is not set +# CONFIG_VIDEO_MT9M114 is not set # CONFIG_VIDEO_MT9P031 is not set # CONFIG_VIDEO_MT9T112 is not set CONFIG_VIDEO_MT9V011=m @@ -4487,6 +4529,7 @@ CONFIG_VIDEO_OV2640=m # CONFIG_VIDEO_OV5675 is not set # CONFIG_VIDEO_OV5693 is not set # CONFIG_VIDEO_OV5695 is not set +# CONFIG_VIDEO_OV64A40 is not set # CONFIG_VIDEO_OV6650 is not set # CONFIG_VIDEO_OV7251 is not set CONFIG_VIDEO_OV7640=m @@ -4508,7 +4551,12 @@ CONFIG_VIDEO_OV7640=m # CONFIG_VIDEO_ST_VGXY61 is not set # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_ET8EK8 is not set -# end of Camera sensor devices + +# +# Camera ISPs +# +# CONFIG_VIDEO_THP7312 is not set +# end of Camera ISPs # # Lens drivers @@ -4516,6 +4564,7 @@ CONFIG_VIDEO_OV7640=m # CONFIG_VIDEO_AD5820 is not set # CONFIG_VIDEO_AK7375 is not set # CONFIG_VIDEO_DW9714 is not set +# CONFIG_VIDEO_DW9719 is not set # CONFIG_VIDEO_DW9768 is not set # CONFIG_VIDEO_DW9807_VCM is not set # end of Lens drivers @@ -4578,6 +4627,7 @@ CONFIG_VIDEO_SAA711X=m CONFIG_VIDEO_TVP5150=m # CONFIG_VIDEO_TVP7002 is not set CONFIG_VIDEO_TW2804=m +# CONFIG_VIDEO_TW9900 is not set CONFIG_VIDEO_TW9903=m CONFIG_VIDEO_TW9906=m # CONFIG_VIDEO_TW9910 is not set @@ -4632,6 +4682,14 @@ CONFIG_VIDEO_M52790=m # CONFIG_VIDEO_THS7303 is not set # end of Miscellaneous helper chips +# +# Video serializers and deserializers +# +# CONFIG_VIDEO_DS90UB913 is not set +# CONFIG_VIDEO_DS90UB953 is not set +# CONFIG_VIDEO_DS90UB960 is not set +# end of Video serializers and deserializers + # # Media SPI Adapters # @@ -4860,6 +4918,7 @@ CONFIG_DVB_SP2=m CONFIG_APERTURE_HELPERS=y CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y +# CONFIG_AUXDISPLAY is not set CONFIG_DRM=y # CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=y @@ -4872,6 +4931,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=y CONFIG_DRM_VRAM_HELPER=y CONFIG_DRM_TTM_HELPER=y +CONFIG_DRM_GEM_DMA_HELPER=m CONFIG_DRM_GEM_SHMEM_HELPER=y CONFIG_DRM_SCHED=y @@ -4895,9 +4955,14 @@ CONFIG_DRM_SCHED=y # CONFIG_DRM_RADEON is not set # CONFIG_DRM_AMDGPU is not set # CONFIG_DRM_NOUVEAU is not set -CONFIG_DRM_VGEM=n +# CONFIG_DRM_XE is not set +# CONFIG_DRM_VGEM is not set # CONFIG_DRM_VKMS is not set +CONFIG_RUST_DRM_SCHED=y +CONFIG_RUST_DRM_GEM_SHMEM_HELPER=y +CONFIG_RUST_APPLE_RTKIT=y CONFIG_DRM_ASAHI=m +# CONFIG_DRM_ASAHI_DEBUG_ALLOCATOR is not set # CONFIG_DRM_VMWGFX is not set # CONFIG_DRM_UDL is not set # CONFIG_DRM_AST is not set @@ -5017,32 +5082,17 @@ CONFIG_DRM_SIMPLEDRM=y # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set CONFIG_DRM_APPLE=m -# CONFIG_DRM_LEGACY is not set +CONFIG_DRM_APPLE_AUDIO=y +# CONFIG_DRM_APPLE_DEBUG is not set +# CONFIG_DRM_POWERVR is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices # -CONFIG_FB_NOTIFY=y CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_IMAGEBLIT=y -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SYS_HELPERS=y -CONFIG_FB_SYS_HELPERS_DEFERRED=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set -# CONFIG_FB_ARMCLCD is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set @@ -5077,6 +5127,21 @@ CONFIG_FB_UDL=m # CONFIG_FB_MB862XX is not set # CONFIG_FB_SSD1307 is not set # CONFIG_FB_SM712 is not set +CONFIG_FB_CORE=y +CONFIG_FB_NOTIFY=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DEVICE=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYSMEM_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y # end of Frame buffer Devices # @@ -5105,6 +5170,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_LM3630A is not set # CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_MP3309C is not set CONFIG_BACKLIGHT_GPIO=m # CONFIG_BACKLIGHT_LV5207LP is not set # CONFIG_BACKLIGHT_BD6107 is not set @@ -5281,6 +5347,9 @@ CONFIG_SND_SOC_WM_ADSP=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AW8738 is not set # CONFIG_SND_SOC_AW88395 is not set +# CONFIG_SND_SOC_AW88261 is not set +# CONFIG_SND_SOC_AW87390 is not set +# CONFIG_SND_SOC_AW88399 is not set # CONFIG_SND_SOC_BD28623 is not set CONFIG_SND_SOC_BT_SCO=m # CONFIG_SND_SOC_CHV3_CODEC is not set @@ -5367,6 +5436,7 @@ CONFIG_SND_SOC_CS53L30=m # CONFIG_SND_SOC_RT5640 is not set # CONFIG_SND_SOC_RT5659 is not set # CONFIG_SND_SOC_RT9120 is not set +# CONFIG_SND_SOC_RTQ9128 is not set # CONFIG_SND_SOC_SGTL5000 is not set # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set # CONFIG_SND_SOC_SIMPLE_MUX is not set @@ -5505,6 +5575,7 @@ CONFIG_HID_GFRM=m CONFIG_HID_GLORIOUS=m CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y +# CONFIG_HID_GOOGLE_STADIA_FF is not set # CONFIG_HID_VIVALDI is not set CONFIG_HID_GT683R=m CONFIG_HID_KEYTOUCH=m @@ -5594,6 +5665,7 @@ CONFIG_HID_ZYDACRON=m CONFIG_HID_SENSOR_HUB=m CONFIG_HID_SENSOR_CUSTOM_SENSOR=m CONFIG_HID_ALPS=m +# CONFIG_HID_MCP2200 is not set CONFIG_HID_MCP2221=m # end of Special HID drivers @@ -5645,6 +5717,7 @@ CONFIG_USB_CONN_GPIO=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y CONFIG_USB_PCI=y +# CONFIG_USB_PCI_AMD is not set CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # @@ -5748,6 +5821,7 @@ CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_PCI=m CONFIG_USB_CHIPIDEA_MSM=m +CONFIG_USB_CHIPIDEA_NPCM=m CONFIG_USB_CHIPIDEA_IMX=m CONFIG_USB_CHIPIDEA_GENERIC=m CONFIG_USB_CHIPIDEA_TEGRA=m @@ -5925,6 +5999,7 @@ CONFIG_USB_CONFIGFS_F_UAC1=y CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y CONFIG_USB_CONFIGFS_F_UAC2=y CONFIG_USB_CONFIGFS_F_MIDI=y +# CONFIG_USB_CONFIGFS_F_MIDI2 is not set CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_UVC=y CONFIG_USB_CONFIGFS_F_PRINTER=y @@ -5985,6 +6060,8 @@ CONFIG_TYPEC_TPS6598X=m # CONFIG_TYPEC_MUX_GPIO_SBU is not set # CONFIG_TYPEC_MUX_PI3USB30532 is not set # CONFIG_TYPEC_MUX_NB7VPQ904M is not set +# CONFIG_TYPEC_MUX_PTN36502 is not set +# CONFIG_TYPEC_MUX_WCD939X_USBSS is not set # end of USB Type-C Multiplexer/DeMultiplexer Switch support # @@ -6057,6 +6134,7 @@ CONFIG_LEDS_GPIO=m # CONFIG_LEDS_LP8860 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set +# CONFIG_LEDS_PCA995X is not set # CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_PWM=m # CONFIG_LEDS_REGULATOR is not set @@ -6105,6 +6183,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_ACTIVITY=y +# CONFIG_LEDS_TRIGGER_GPIO is not set CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # @@ -6172,6 +6251,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_HYM8563 is not set # CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_MAX31335 is not set # CONFIG_RTC_DRV_NCT3018Y is not set # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_ISL1208 is not set @@ -6238,7 +6318,6 @@ CONFIG_RTC_I2C_AND_SPI=y # CONFIG_RTC_DRV_M48T35 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_MSM6242 is not set -# CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_RP5C01 is not set # CONFIG_RTC_DRV_ZYNQMP is not set @@ -6263,10 +6342,12 @@ CONFIG_DMADEVICES=y # DMA Devices # CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=m CONFIG_DMA_OF=y # CONFIG_ALTERA_MSGDMA is not set # CONFIG_AMBA_PL08X is not set CONFIG_APPLE_ADMAC=m +CONFIG_APPLE_SIO=m # CONFIG_DW_AXI_DMAC is not set # CONFIG_FSL_EDMA is not set # CONFIG_FSL_QDMA is not set @@ -6304,13 +6385,14 @@ CONFIG_SYNC_FILE=y # CONFIG_DMABUF_SYSFS_STATS is not set # end of DMABUF options -# CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set CONFIG_VFIO=m +CONFIG_VFIO_GROUP=y CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_VIRQFD=y +# CONFIG_VFIO_DEBUGFS is not set # # VFIO support for PCI devices @@ -6336,6 +6418,7 @@ CONFIG_VFIO_PLATFORM=m # end of VFIO platform reset drivers # end of VFIO support for platform devices +CONFIG_IRQ_BYPASS_MANAGER=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_ANCHOR=y CONFIG_VIRTIO=y @@ -6368,7 +6451,6 @@ CONFIG_VHOST_VSOCK=m # CONFIG_COMEDI is not set CONFIG_STAGING=y CONFIG_PRISM2_USB=m -CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m @@ -6383,6 +6465,10 @@ CONFIG_R8712U=m CONFIG_STAGING_MEDIA=y # CONFIG_DVB_AV7110 is not set # CONFIG_VIDEO_MAX96712 is not set + +# +# StarFive media platform drivers +# # CONFIG_STAGING_MEDIA_DEPRECATED is not set # CONFIG_STAGING_BOARD is not set # CONFIG_LTE_GDM724X is not set @@ -6391,7 +6477,6 @@ CONFIG_STAGING_MEDIA=y # CONFIG_PI433 is not set # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_FIELDBUS_DEV is not set -# CONFIG_QLGE is not set # CONFIG_VME_BUS is not set # CONFIG_GOLDFISH is not set # CONFIG_CHROME_PLATFORMS is not set @@ -6427,6 +6512,7 @@ CONFIG_COMMON_CLK_APPLE_NCO=m # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI521XX is not set +# CONFIG_COMMON_CLK_VC3 is not set # CONFIG_COMMON_CLK_VC5 is not set # CONFIG_COMMON_CLK_VC7 is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set @@ -6500,10 +6586,9 @@ CONFIG_APPLE_DART=m # # Apple SoC drivers # -CONFIG_APPLE_PMGR_PWRSTATE=y CONFIG_APPLE_PMGR_MISC=y -CONFIG_APPLE_MBOX=m -CONFIG_APPLE_RTKIT=m +CONFIG_APPLE_MAILBOX=y +CONFIG_APPLE_RTKIT=y CONFIG_APPLE_RTKIT_HELPER=m CONFIG_APPLE_SART=m CONFIG_APPLE_DOCKCHANNEL=m @@ -6512,13 +6597,13 @@ CONFIG_APPLE_DOCKCHANNEL=m # # Broadcom SoC drivers # -# CONFIG_SOC_BRCMSTB is not set # end of Broadcom SoC drivers # # NXP/Freescale QorIQ SoC drivers # # CONFIG_QUICC_ENGINE is not set +# CONFIG_FSL_RCPM is not set # end of NXP/Freescale QorIQ SoC drivers # @@ -6552,6 +6637,33 @@ CONFIG_APPLE_DOCKCHANNEL=m # end of Xilinx SoC drivers # end of SOC (System On Chip) specific Drivers +# +# PM Domains +# + +# +# Amlogic PM Domains +# +# end of Amlogic PM Domains + +CONFIG_APPLE_PMGR_PWRSTATE=y + +# +# Broadcom PM Domains +# +# end of Broadcom PM Domains + +# +# i.MX PM Domains +# +# end of i.MX PM Domains + +# +# Qualcomm PM Domains +# +# end of Qualcomm PM Domains +# end of PM Domains + CONFIG_PM_DEVFREQ=y # @@ -6622,6 +6734,7 @@ CONFIG_RESET_CONTROLLER=y CONFIG_GENERIC_PHY=y # CONFIG_PHY_CAN_TRANSCEIVER is not set CONFIG_PHY_APPLE_ATC=m +CONFIG_PHY_APPLE_DPTX=y # # PHY drivers for Broadcom platforms @@ -6656,12 +6769,14 @@ CONFIG_POWERCAP=y # CONFIG_ARM_CCN is not set # CONFIG_ARM_CMN is not set CONFIG_ARM_PMU=y +# CONFIG_ARM_SMMU_V3_PMU is not set CONFIG_ARM_PMUV3=y # CONFIG_ARM_DSU_PMU is not set # CONFIG_ARM_SPE_PMU is not set CONFIG_APPLE_M1_CPU_PMU=y # CONFIG_HISI_PCIE_PMU is not set # CONFIG_HNS3_PMU is not set +# CONFIG_DWC_PCIE_PMU is not set # CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # end of Performance monitor support @@ -6678,6 +6793,7 @@ CONFIG_RAS=y # CONFIG_DAX is not set CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y +CONFIG_NVMEM_LAYOUTS=y # # Layout Types @@ -6710,6 +6826,7 @@ CONFIG_MULTIPLEXER=m # # CONFIG_MUX_ADG792A is not set # CONFIG_MUX_ADGS1408 is not set +# CONFIG_MUX_APPLE_DPXBAR is not set # CONFIG_MUX_GPIO is not set # CONFIG_MUX_MMIO is not set # end of Multiplexer drivers @@ -6731,6 +6848,8 @@ CONFIG_PM_OPP=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_FS_IOMAP=y +CONFIG_FS_STACK=y +CONFIG_BUFFER_HEAD=y CONFIG_LEGACY_DIRECT_IO=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set @@ -6772,13 +6891,13 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OCFS2_DEBUG_FS is not set CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set # CONFIG_BTRFS_ASSERT is not set # CONFIG_BTRFS_FS_REF_VERIFY is not set CONFIG_NILFS2_FS=m # CONFIG_F2FS_FS is not set +# CONFIG_BCACHEFS_FS is not set # CONFIG_ZONEFS_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -6809,19 +6928,14 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # CONFIG_OVERLAY_FS_INDEX is not set # CONFIG_OVERLAY_FS_XINO_AUTO is not set # CONFIG_OVERLAY_FS_METACOPY is not set +# CONFIG_OVERLAY_FS_DEBUG is not set # # Caches # CONFIG_NETFS_SUPPORT=m CONFIG_NETFS_STATS=y -CONFIG_FSCACHE=m -CONFIG_FSCACHE_STATS=y -# CONFIG_FSCACHE_DEBUG is not set -CONFIG_CACHEFILES=m -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_ERROR_INJECTION is not set -# CONFIG_CACHEFILES_ONDEMAND is not set +# CONFIG_FSCACHE is not set # end of Caches # @@ -6865,10 +6979,10 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS_QUOTA is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y CONFIG_EFIVAR_FS=y @@ -6920,15 +7034,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y CONFIG_ROMFS_ON_BLOCK=y CONFIG_PSTORE=y CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 -CONFIG_PSTORE_DEFLATE_COMPRESS=y -# CONFIG_PSTORE_LZO_COMPRESS is not set -# CONFIG_PSTORE_LZ4_COMPRESS is not set -# CONFIG_PSTORE_LZ4HC_COMPRESS is not set -# CONFIG_PSTORE_842_COMPRESS is not set -# CONFIG_PSTORE_ZSTD_COMPRESS is not set CONFIG_PSTORE_COMPRESS=y -CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y -CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set CONFIG_PSTORE_RAM=m @@ -6968,6 +7074,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_FLEXFILELAYOUT=y CONFIG_NFSD_V4_2_INTER_SSC=y CONFIG_NFSD_V4_SECURITY_LABEL=y +# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set CONFIG_GRACE_PERIOD=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y @@ -6979,14 +7086,11 @@ CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y -# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m -CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS_POSIX_ACL=y # CONFIG_CEPH_FS_SECURITY_LABEL is not set CONFIG_CIFS=m @@ -7000,13 +7104,11 @@ CONFIG_CIFS_DEBUG=y # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set -CONFIG_CIFS_FSCACHE=y # CONFIG_SMB_SERVER is not set CONFIG_SMBFS=m CONFIG_CODA_FS=m # CONFIG_AFS_FS is not set CONFIG_9P_FS=m -CONFIG_9P_FSCACHE=y CONFIG_9P_FS_POSIX_ACL=y CONFIG_9P_FS_SECURITY=y CONFIG_NLS=y @@ -7060,6 +7162,7 @@ CONFIG_NLS_MAC_INUIT=m CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_UTF8=y +CONFIG_NLS_UCS2_UTILS=m CONFIG_DLM=m CONFIG_DLM_DEBUG=y CONFIG_UNICODE=m @@ -7121,15 +7224,23 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_STACK_ALL_PATTERN is not set # CONFIG_INIT_STACK_ALL_ZERO is not set +# CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # CONFIG_ZERO_CALL_USED_REGS is not set # end of Memory initialization -CONFIG_CC_HAS_RANDSTRUCT=y +# +# Hardening of kernel data structures +# +# CONFIG_LIST_HARDENED is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# end of Hardening of kernel data structures + CONFIG_RANDSTRUCT_NONE=y # CONFIG_RANDSTRUCT_FULL is not set +# CONFIG_RANDSTRUCT_PERFORMANCE is not set # end of Kernel hardening options # end of Security options @@ -7221,14 +7332,12 @@ CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_HCTR2 is not set CONFIG_CRYPTO_KEYWRAP=m CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_NHPOLY1305=y @@ -7303,7 +7412,9 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y -# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 +CONFIG_CRYPTO_JITTERENTROPY_OSR=1 CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation @@ -7361,6 +7472,7 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_QAT_C3XXX is not set # CONFIG_CRYPTO_DEV_QAT_C62X is not set # CONFIG_CRYPTO_DEV_QAT_4XXX is not set +# CONFIG_CRYPTO_DEV_QAT_420XX is not set # CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set # CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set @@ -7470,7 +7582,6 @@ CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y # CONFIG_XZ_DEC_X86 is not set # CONFIG_XZ_DEC_POWERPC is not set -# CONFIG_XZ_DEC_IA64 is not set CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y # CONFIG_XZ_DEC_SPARC is not set @@ -7495,6 +7606,7 @@ CONFIG_TEXTSEARCH_FSM=m CONFIG_INTERVAL_TREE=y CONFIG_XARRAY_MULTI=y CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_CLOSURES=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT_MAP=y @@ -7511,13 +7623,13 @@ CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB_DYNAMIC is not set CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y # CONFIG_DMA_RESTRICTED_POOL is not set CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_COHERENT_POOL=y CONFIG_DMA_DIRECT_REMAP=y CONFIG_DMA_CMA=y -# CONFIG_DMA_PERNUMA_CMA is not set # # Default contiguous memory area size: @@ -7539,6 +7651,7 @@ CONFIG_LRU_CACHE=m CONFIG_CLZ_TAB=y CONFIG_IRQ_POLL=y CONFIG_MPILIB=y +CONFIG_DIMLIB=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y @@ -7563,6 +7676,7 @@ CONFIG_FONT_TER16x32=y CONFIG_SG_POOL=y CONFIG_ARCH_STACKWALK=y CONFIG_SBITMAP=y +# CONFIG_LWQ_TEST is not set # end of Library routines CONFIG_GENERIC_IOREMAP=y @@ -7594,14 +7708,16 @@ CONFIG_DEBUG_MISC=y # # Compile-time checks and compiler options # -CONFIG_AS_HAS_NON_CONST_LEB128=y +CONFIG_AS_HAS_NON_CONST_ULEB128=y CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set CONFIG_FRAME_WARN=2048 CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set # CONFIG_HEADERS_INSTALL is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y @@ -7738,12 +7854,10 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# CONFIG_DEBUG_CLOSURES is not set # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures -# CONFIG_DEBUG_CREDENTIALS is not set - # # RCU Debugging # From a8a5ac53b42131e92f4eeda892b044f61861e098 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Mon, 13 May 2024 15:30:26 +0200 Subject: [PATCH 18/37] bump to 6.8.9-5 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index e9e991e..8f4a260 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,8 +5,8 @@ buildarch=8 _rcver=6.8.9 #_rcrel=3 -_asahirel=1 -pkgrel=2 +_asahirel=5 +pkgrel=1 _m1n1_version=1.4.11 @@ -29,9 +29,9 @@ source=( https://github.com/AsahiLinux/linux/archive/${_commit_id}.tar.gz config # the main kernel config file ) -sha256sums=('0d7ed4c8dfebb2001c6c8b0010c8d3d3f5fc6801ca38bb029b9d504fa6aa4ac4' +sha256sums=('15e8837a6905324500e7cf7972e6a8b25a21897ae2b8e5003129af885a2edd2f' '9432e63b6c631273d7ef2040703c4fd70f99f16261168dc4e1a9aae2fec2ce99') -b2sums=('16624f93eabdf1ff40a420cfb7108e13c7f5f1ccba88c84b2a8c9057d1b22b8e17e0c8f33381f41e0098772843e8b1b47ceae521e2a2760d173850a5d0687ce0' +b2sums=('5a08d3df1d0e1fc274a68f29ab592c790421d58dafa5533b7f526f13c5046d668e0c864b9a71f2c5b736a1890a65ba0877694b11bbde9acf5ff873f7a8a5a167' '4353850ca1b12cd8eb8176b83973274ef802ac5625ad04918d0d90212305b750051cd93b286e45db723aaddd2421cecd133bbb94ae7c5ee56b2d5d5d0d2e072d') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase From 75949061411ba009460d3c1fa6ba6a83457d1cb1 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 15 May 2024 10:43:39 +0200 Subject: [PATCH 19/37] Enable speakers Signed-off-by: Matthias Kurz --- ...AGE-macaudio-Enable-first-round-of-m.patch | 82 +++++++++++++++++++ ...AGE-macaudio-Enable-second-round-of-.patch | 51 ++++++++++++ linux-asahi/PKGBUILD | 10 ++- 3 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 linux-asahi/0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch create mode 100644 linux-asahi/0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch diff --git a/linux-asahi/0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch b/linux-asahi/0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch new file mode 100644 index 0000000..4577a6f --- /dev/null +++ b/linux-asahi/0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch @@ -0,0 +1,82 @@ +From 385ea7b5023486aba7919cec8b6b3f6a843a1013 Mon Sep 17 00:00:00 2001 +From: Hector Martin +Date: Fri, 15 Dec 2023 20:38:32 +0900 +Subject: [PATCH 1/2] READ COMMIT MESSAGE! macaudio: Enable first round of + models + +Enables j313, j293, j493, j314, j414, j274, j375, j473, j474, j475 + +*** WARNING FOR DISTRO PACKAGERS WANTING TO APPLY THIS: *** +*** YOU ABSOLUTELY NEED THIS PATCH IN YOUR LSP-PLUGINS PACKAGE *** + +https://github.com/lsp-plugins/lsp-dsp-lib/pull/20 + +Do NOT enable speakers without that patch, on any model. It can/will +result in nasty noise that could damage them. + +Signed-off-by: Hector Martin +--- + sound/soc/apple/macaudio.c | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/sound/soc/apple/macaudio.c b/sound/soc/apple/macaudio.c +index f5b349057a67..d2ced87e88c0 100644 +--- a/sound/soc/apple/macaudio.c ++++ b/sound/soc/apple/macaudio.c +@@ -1490,23 +1490,27 @@ struct macaudio_platform_cfg macaudio_j180_cfg = { + false, AMP_SN012776, SPKR_1W1T, false, 10, -20, + }; + struct macaudio_platform_cfg macaudio_j274_cfg = { +- false, AMP_TAS5770, SPKR_1W, false, 20, -20, ++ true, AMP_TAS5770, SPKR_1W, false, 20, -20, + }; + + struct macaudio_platform_cfg macaudio_j293_cfg = { +- false, AMP_TAS5770, SPKR_2W, true, 15, -20, ++ true, AMP_TAS5770, SPKR_2W, true, 15, -20, + }; + + struct macaudio_platform_cfg macaudio_j313_cfg = { +- false, AMP_TAS5770, SPKR_1W, true, 10, -20, ++ true, AMP_TAS5770, SPKR_1W, true, 10, -20, + }; + +-struct macaudio_platform_cfg macaudio_j314_j316_cfg = { ++struct macaudio_platform_cfg macaudio_j314_cfg = { ++ true, AMP_SN012776, SPKR_2W1T, true, 15, -20, ++}; ++ ++struct macaudio_platform_cfg macaudio_j316_cfg = { + false, AMP_SN012776, SPKR_2W1T, true, 15, -20, + }; + + struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = { +- false, AMP_SN012776, SPKR_1W, false, 20, -20, ++ true, AMP_SN012776, SPKR_1W, false, 20, -20, + }; + + struct macaudio_platform_cfg macaudio_j413_cfg = { +@@ -1522,7 +1526,7 @@ struct macaudio_platform_cfg macaudio_j45x_cfg = { + }; + + struct macaudio_platform_cfg macaudio_j493_cfg = { +- false, AMP_SN012776, SPKR_2W, true, 15, -20, ++ true, AMP_SN012776, SPKR_2W, true, 15, -20, + }; + + struct macaudio_platform_cfg macaudio_fallback_cfg = { +@@ -1558,9 +1562,9 @@ static const struct of_device_id macaudio_snd_device_id[] = { + /* j313 AID4 tas5770 10 2× 1W */ + { .compatible = "apple,j313-macaudio", .data = &macaudio_j313_cfg }, + /* j314 AID8 sn012776 15 2× 2W+1T */ +- { .compatible = "apple,j314-macaudio", .data = &macaudio_j314_j316_cfg }, ++ { .compatible = "apple,j314-macaudio", .data = &macaudio_j314_cfg }, + /* j316 AID9 sn012776 15 2× 2W+1T */ +- { .compatible = "apple,j316-macaudio", .data = &macaudio_j314_j316_cfg }, ++ { .compatible = "apple,j316-macaudio", .data = &macaudio_j316_cfg }, + /* j375 AID10 sn012776 15 1× 1W */ + { .compatible = "apple,j375-macaudio", .data = &macaudio_j37x_j47x_cfg }, + /* j413 AID13 sn012776 15 2× 1W+1T */ +-- +2.45.0 + diff --git a/linux-asahi/0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch b/linux-asahi/0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch new file mode 100644 index 0000000..2355c68 --- /dev/null +++ b/linux-asahi/0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch @@ -0,0 +1,51 @@ +From 6a24102c06c95951ab992e2d41336cc6d4bfdf23 Mon Sep 17 00:00:00 2001 +From: Hector Martin +Date: Fri, 15 Dec 2023 20:40:53 +0900 +Subject: [PATCH 2/2] READ COMMIT MESSAGE! macaudio: Enable second round of + models + +Enables j316, j413, j415, j416 + +*** WARNING FOR DISTRO PACKAGERS WANTING TO APPLY THIS: *** +*** YOU ABSOLUTELY NEED THIS PATCH IN YOUR LSP-PLUGINS PACKAGE *** + +https://github.com/lsp-plugins/lsp-dsp-lib/pull/20 + +Do NOT enable speakers without that patch, on any model. It can/will +result in nasty noise that could damage them. + +Signed-off-by: Hector Martin +--- + sound/soc/apple/macaudio.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sound/soc/apple/macaudio.c b/sound/soc/apple/macaudio.c +index d2ced87e88c0..f347f08b7ad0 100644 +--- a/sound/soc/apple/macaudio.c ++++ b/sound/soc/apple/macaudio.c +@@ -1506,7 +1506,7 @@ struct macaudio_platform_cfg macaudio_j314_cfg = { + }; + + struct macaudio_platform_cfg macaudio_j316_cfg = { +- false, AMP_SN012776, SPKR_2W1T, true, 15, -20, ++ true, AMP_SN012776, SPKR_2W1T, true, 15, -20, + }; + + struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = { +@@ -1514,11 +1514,11 @@ struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = { + }; + + struct macaudio_platform_cfg macaudio_j413_cfg = { +- false, AMP_SN012776, SPKR_1W1T, true, 15, -20, ++ true, AMP_SN012776, SPKR_1W1T, true, 15, -20, + }; + + struct macaudio_platform_cfg macaudio_j415_cfg = { +- false, AMP_SN012776, SPKR_2W1T, true, 15, -20, ++ true, AMP_SN012776, SPKR_2W1T, true, 15, -20, + }; + + struct macaudio_platform_cfg macaudio_j45x_cfg = { +-- +2.45.0 + diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 8f4a260..eb6672c 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -28,11 +28,17 @@ options=('!strip') source=( https://github.com/AsahiLinux/linux/archive/${_commit_id}.tar.gz config # the main kernel config file + 0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch + 0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch ) sha256sums=('15e8837a6905324500e7cf7972e6a8b25a21897ae2b8e5003129af885a2edd2f' - '9432e63b6c631273d7ef2040703c4fd70f99f16261168dc4e1a9aae2fec2ce99') + '9432e63b6c631273d7ef2040703c4fd70f99f16261168dc4e1a9aae2fec2ce99' + 'd133d00c2198673b5f8a37249ea936a466dc98050a7b6b0767d7a6dfc42d8541' + '95408f3b1cc8842e12ffaa3ce41ada149ee32fd5bd2bbafa95449388a37cef7c') b2sums=('5a08d3df1d0e1fc274a68f29ab592c790421d58dafa5533b7f526f13c5046d668e0c864b9a71f2c5b736a1890a65ba0877694b11bbde9acf5ff873f7a8a5a167' - '4353850ca1b12cd8eb8176b83973274ef802ac5625ad04918d0d90212305b750051cd93b286e45db723aaddd2421cecd133bbb94ae7c5ee56b2d5d5d0d2e072d') + '4353850ca1b12cd8eb8176b83973274ef802ac5625ad04918d0d90212305b750051cd93b286e45db723aaddd2421cecd133bbb94ae7c5ee56b2d5d5d0d2e072d' + '2e0015cfb2aea1b4bc2da796f4a40c7d9ac21baf08aae572d28ecc4f0f399141072df42acb598176cfb06c6184dadc1ccfbf8a2a8b4e9085759260e800068e26' + '2b0481f336dbf33c3909ac16a9b3ab8b425a31a085746730648910a00b8fabf90ba3988e4bb04d9c8801e1b100c6ecba858c191a2fab00c0af51f931c26a515d') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" From da2f666f32ec6ca08865667250b4d693b555628d Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Wed, 15 May 2024 11:01:29 +0200 Subject: [PATCH 20/37] bump pkgrel after adding the audio patches Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index eb6672c..b0faf5e 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -6,7 +6,7 @@ buildarch=8 _rcver=6.8.9 #_rcrel=3 _asahirel=5 -pkgrel=1 +pkgrel=2 _m1n1_version=1.4.11 From 592f2e0b5c331cb09081d68cf9249d5d04518267 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 17 May 2024 11:15:00 +0200 Subject: [PATCH 21/37] Enable UCLAMP to safe battery with speakers Signed-off-by: Matthias Kurz --- linux-asahi/config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/linux-asahi/config b/linux-asahi/config index 39da3d2..4b4320a 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -161,7 +161,8 @@ CONFIG_GENERIC_SCHED_CLOCK=y # # Scheduler features # -# CONFIG_UCLAMP_TASK is not set +CONFIG_UCLAMP_TASK=y +CONFIG_UCLAMP_BUCKETS_COUNT=5 # end of Scheduler features CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y @@ -185,6 +186,7 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y # CONFIG_RT_GROUP_SCHED is not set CONFIG_SCHED_MM_CID=y +CONFIG_UCLAMP_TASK_GROUP=y CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_RDMA=y CONFIG_CGROUP_FREEZER=y From d2e97ef8746cd55e2b4402fee39ed83139e3076f Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 17 May 2024 12:53:36 +0200 Subject: [PATCH 22/37] Update config according to wiki and Fedora config https://github.com/AsahiLinux/docs/wiki/Kernel-config-notes-for-distros https://copr-dist-git.fedorainfracloud.org/cgit/@asahi/kernel/kernel.git/tree/kernel-aarch64-16k-fedora.config?h=f40 Signed-off-by: Matthias Kurz --- linux-asahi/config | 217 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 172 insertions(+), 45 deletions(-) diff --git a/linux-asahi/config b/linux-asahi/config index 4b4320a..1579e3c 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -273,9 +273,9 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_RUST=y -CONFIG_RUSTC_VERSION_TEXT="rustc 1.76.0 (07dca489a 2024-02-04)" +CONFIG_RUSTC_VERSION_TEXT="rustc 1.78.0 (9b00956e5 2024-04-29) (Arch Linux rust 1:1.78.0-1)" CONFIG_RUSTC_LLVM_VERSION_TEXT="17.0.6" -CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.65.1" +CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.69.4" # # Kexec and crash features @@ -611,7 +611,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y # CONFIG_CPUFREQ_DT=y CONFIG_CPUFREQ_DT_PLATDEV=y -CONFIG_ARM_APPLE_SOC_CPUFREQ=m +CONFIG_ARM_APPLE_SOC_CPUFREQ=y # end of CPU Frequency scaling # end of CPU Power Management @@ -752,8 +752,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_GCC_PLUGINS=y -# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set +# CONFIG_GCC_PLUGINS is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT=4 # end of General architecture-dependent options @@ -1945,11 +1944,11 @@ CONFIG_HOTPLUG_PCI=y # # CONFIG_PCIE_ALTERA is not set CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000 -CONFIG_PCIE_APPLE=m +CONFIG_PCIE_APPLE=y # CONFIG_PCI_HOST_THUNDER_PEM is not set # CONFIG_PCI_HOST_THUNDER_ECAM is not set # CONFIG_PCI_FTPCI100 is not set -CONFIG_PCI_HOST_COMMON=m +CONFIG_PCI_HOST_COMMON=y # CONFIG_PCI_HOST_GENERIC is not set # CONFIG_PCIE_MICROCHIP_HOST is not set # CONFIG_PCI_XGENE is not set @@ -2031,7 +2030,7 @@ CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_SPMI=m +CONFIG_REGMAP_SPMI=y CONFIG_REGMAP_MMIO=y CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y @@ -2285,7 +2284,7 @@ CONFIG_NVME_VERBOSE_ERRORS=y # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set # CONFIG_NVME_HOST_AUTH is not set -CONFIG_NVME_APPLE=m +CONFIG_NVME_APPLE=y # CONFIG_NVME_TARGET is not set # end of NVME Support @@ -3151,7 +3150,80 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_PEGASUS=m # CONFIG_TABLET_SERIAL_WACOM4 is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=m +# CONFIG_TOUCHSCREEN_AR1021_I2C is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_BU21029 is not set +# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set +# CONFIG_TOUCHSCREEN_CY8CTMA140 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP5 is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_EGALAX is not set +# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set +# CONFIG_TOUCHSCREEN_EXC3000 is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set +# CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set +# CONFIG_TOUCHSCREEN_S6SY761 is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_EKTF2127 is not set +# CONFIG_TOUCHSCREEN_ELAN is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set +# CONFIG_TOUCHSCREEN_IMAGIS is not set +# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2004 is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_RM_TS is not set +# CONFIG_TOUCHSCREEN_SILEAD is not set +# CONFIG_TOUCHSCREEN_SIS_I2C is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_STMFTS is not set +# CONFIG_TOUCHSCREEN_SUR40 is not set +# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set +# CONFIG_TOUCHSCREEN_SX8654 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_ZET6223 is not set +# CONFIG_TOUCHSCREEN_ZFORCE is not set +# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set +# CONFIG_TOUCHSCREEN_IQS5XX is not set +# CONFIG_TOUCHSCREEN_IQS7211 is not set +# CONFIG_TOUCHSCREEN_ZINITIX is not set +# CONFIG_TOUCHSCREEN_HIMAX_HX83112B is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ATMEL_CAPTOUCH is not set @@ -3183,7 +3255,7 @@ CONFIG_INPUT_PWM_VIBRA=m # CONFIG_INPUT_DRV260X_HAPTICS is not set # CONFIG_INPUT_DRV2665_HAPTICS is not set # CONFIG_INPUT_DRV2667_HAPTICS is not set -CONFIG_INPUT_MACSMC_HID=m +CONFIG_INPUT_MACSMC_HID=y # CONFIG_RMI4_CORE is not set # @@ -3336,7 +3408,7 @@ CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_HISI is not set # CONFIG_I2C_NOMADIK is not set # CONFIG_I2C_OCORES is not set -CONFIG_I2C_APPLE=m +CONFIG_I2C_APPLE=y # CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_RK3X is not set # CONFIG_I2C_SIMTEC is not set @@ -3376,7 +3448,7 @@ CONFIG_SPI_MEM=y # SPI Master Controller Drivers # # CONFIG_SPI_ALTERA is not set -CONFIG_SPI_APPLE=m +CONFIG_SPI_APPLE=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_CADENCE is not set @@ -3416,7 +3488,7 @@ CONFIG_SPI_SPIDEV=m CONFIG_SPI_DYNAMIC=y CONFIG_SPMI=y # CONFIG_SPMI_HISI3670 is not set -CONFIG_SPMI_APPLE=m +CONFIG_SPMI_APPLE=y # CONFIG_HSI is not set CONFIG_PPS=y # CONFIG_PPS_DEBUG is not set @@ -3450,7 +3522,7 @@ CONFIG_GENERIC_PINCTRL_GROUPS=y CONFIG_PINMUX=y CONFIG_GENERIC_PINMUX_FUNCTIONS=y # CONFIG_DEBUG_PINCTRL is not set -CONFIG_PINCTRL_APPLE_GPIO=m +CONFIG_PINCTRL_APPLE_GPIO=y # CONFIG_PINCTRL_CY8C95X0 is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set @@ -3513,7 +3585,7 @@ CONFIG_GPIO_CDEV_V1=y # # MFD GPIO expanders # -CONFIG_GPIO_MACSMC=m +CONFIG_GPIO_MACSMC=y # end of MFD GPIO expanders # @@ -3555,7 +3627,7 @@ CONFIG_GPIO_MACSMC=m CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_GPIO is not set # CONFIG_POWER_RESET_GPIO_RESTART is not set -CONFIG_POWER_RESET_MACSMC=m +CONFIG_POWER_RESET_MACSMC=y # CONFIG_POWER_RESET_LTC2952 is not set # CONFIG_POWER_RESET_REGULATOR is not set # CONFIG_POWER_RESET_RESTART is not set @@ -3608,7 +3680,7 @@ CONFIG_POWER_SUPPLY_HWMON=y # CONFIG_CHARGER_BD99954 is not set # CONFIG_BATTERY_UG3105 is not set # CONFIG_FUEL_GAUGE_MM8013 is not set -CONFIG_CHARGER_MACSMC=m +CONFIG_CHARGER_MACSMC=y CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3847,9 +3919,9 @@ CONFIG_BCMA_POSSIBLE=y # # Multifunction device drivers # -CONFIG_MFD_CORE=m +CONFIG_MFD_CORE=y # CONFIG_MFD_ACT8945A is not set -CONFIG_MFD_APPLE_SPMI_PMU=m +CONFIG_MFD_APPLE_SPMI_PMU=y # CONFIG_MFD_AS3711 is not set # CONFIG_MFD_SMPRO is not set # CONFIG_MFD_AS3722 is not set @@ -3919,7 +3991,7 @@ CONFIG_MFD_APPLE_SPMI_PMU=m # CONFIG_MFD_RN5T618 is not set # CONFIG_MFD_SEC_CORE is not set # CONFIG_MFD_SI476X_CORE is not set -CONFIG_MFD_SIMPLE_MFD_SPMI=m +CONFIG_MFD_SIMPLE_MFD_SPMI=y # CONFIG_MFD_SM501 is not set # CONFIG_MFD_SKY81452 is not set # CONFIG_MFD_STMPE is not set @@ -4922,6 +4994,7 @@ CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y # CONFIG_AUXDISPLAY is not set CONFIG_DRM=y +CONFIG_DRM_MIPI_DSI=y # CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set @@ -4963,7 +5036,7 @@ CONFIG_DRM_SCHED=y CONFIG_RUST_DRM_SCHED=y CONFIG_RUST_DRM_GEM_SHMEM_HELPER=y CONFIG_RUST_APPLE_RTKIT=y -CONFIG_DRM_ASAHI=m +CONFIG_DRM_ASAHI=y # CONFIG_DRM_ASAHI_DEBUG_ALLOCATOR is not set # CONFIG_DRM_VMWGFX is not set # CONFIG_DRM_UDL is not set @@ -4979,36 +5052,93 @@ CONFIG_DRM_PANEL=y # # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set # CONFIG_DRM_PANEL_ARM_VERSATILE is not set +# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set +# CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set +# CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set +# CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set +# CONFIG_DRM_PANEL_DSI_CM is not set # CONFIG_DRM_PANEL_LVDS is not set CONFIG_DRM_PANEL_SIMPLE=m # CONFIG_DRM_PANEL_EDP is not set +# CONFIG_DRM_PANEL_EBBG_FT8719 is not set +# CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set +# CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set +# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set +# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set +# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set +# CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set +# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set +# CONFIG_DRM_PANEL_JDI_LPM102A188A is not set +# CONFIG_DRM_PANEL_JDI_R63452 is not set +# CONFIG_DRM_PANEL_KHADAS_TS050 is not set +# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set +# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set +# CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set +# CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set +# CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set +# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set +# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set +# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set +# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set +# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set +# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set +# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set # CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set +# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set +# CONFIG_DRM_PANEL_SHARP_LS060T1SX01 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set +# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set +# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set +# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set +# CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set +# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set +# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set +# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set +# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set +# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set +# CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels CONFIG_DRM_BRIDGE=y @@ -5080,7 +5210,7 @@ CONFIG_DRM_SIMPLEDRM=y # CONFIG_DRM_LIMA is not set # CONFIG_DRM_PANFROST is not set # CONFIG_DRM_TIDSS is not set -# CONFIG_DRM_ADP is not set +CONFIG_DRM_ADP=m # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set CONFIG_DRM_APPLE=m @@ -5699,10 +5829,10 @@ CONFIG_I2C_HID=y # # SPI HID support # -CONFIG_SPI_HID_APPLE_OF=m +CONFIG_SPI_HID_APPLE_OF=y # end of SPI HID support -CONFIG_SPI_HID_APPLE_CORE=m +CONFIG_SPI_HID_APPLE_CORE=y # # DockChannel HID support @@ -5743,7 +5873,7 @@ CONFIG_USB_MON=m CONFIG_USB_XHCI_HCD=m # CONFIG_USB_XHCI_DBGCAP is not set CONFIG_USB_XHCI_PCI=m -# CONFIG_USB_XHCI_PCI_RENESAS is not set +CONFIG_USB_XHCI_PCI_RENESAS=y CONFIG_USB_XHCI_PCI_ASMEDIA=y CONFIG_USB_XHCI_PLATFORM=m # CONFIG_USB_EHCI_HCD is not set @@ -6138,7 +6268,7 @@ CONFIG_LEDS_GPIO=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PCA995X is not set # CONFIG_LEDS_DAC124S085 is not set -CONFIG_LEDS_PWM=m +CONFIG_LEDS_PWM=y # CONFIG_LEDS_REGULATOR is not set # CONFIG_LEDS_BD2606MVV is not set # CONFIG_LEDS_BD2802 is not set @@ -6336,7 +6466,7 @@ CONFIG_RTC_I2C_AND_SPI=y # HID Sensor RTC drivers # # CONFIG_RTC_DRV_GOLDFISH is not set -CONFIG_RTC_DRV_MACSMC=m +CONFIG_RTC_DRV_MACSMC=y CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -6344,11 +6474,11 @@ CONFIG_DMADEVICES=y # DMA Devices # CONFIG_DMA_ENGINE=y -CONFIG_DMA_VIRTUAL_CHANNELS=m +CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DMA_OF=y # CONFIG_ALTERA_MSGDMA is not set # CONFIG_AMBA_PL08X is not set -CONFIG_APPLE_ADMAC=m +CONFIG_APPLE_ADMAC=y CONFIG_APPLE_SIO=m # CONFIG_DW_AXI_DMAC is not set # CONFIG_FSL_EDMA is not set @@ -6485,8 +6615,8 @@ CONFIG_STAGING_MEDIA=y # CONFIG_MELLANOX_PLATFORM is not set # CONFIG_SURFACE_PLATFORMS is not set CONFIG_APPLE_PLATFORMS=y -CONFIG_APPLE_SMC=m -CONFIG_APPLE_SMC_RTKIT=m +CONFIG_APPLE_SMC=y +CONFIG_APPLE_SMC_RTKIT=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -6499,7 +6629,7 @@ CONFIG_CLK_SP810=y # end of Clock driver for ARM Reference designs # CONFIG_LMK04832 is not set -CONFIG_COMMON_CLK_APPLE_NCO=m +CONFIG_COMMON_CLK_APPLE_NCO=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -6557,7 +6687,7 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y CONFIG_OF_IOMMU=y CONFIG_IOMMU_DMA=y # CONFIG_IOMMUFD is not set -CONFIG_APPLE_DART=m +CONFIG_APPLE_DART=y # CONFIG_ARM_SMMU is not set # CONFIG_ARM_SMMU_V3 is not set # CONFIG_VIRTIO_IOMMU is not set @@ -6591,9 +6721,9 @@ CONFIG_APPLE_DART=m CONFIG_APPLE_PMGR_MISC=y CONFIG_APPLE_MAILBOX=y CONFIG_APPLE_RTKIT=y -CONFIG_APPLE_RTKIT_HELPER=m -CONFIG_APPLE_SART=m -CONFIG_APPLE_DOCKCHANNEL=m +CONFIG_APPLE_RTKIT_HELPER=y +CONFIG_APPLE_SART=y +CONFIG_APPLE_DOCKCHANNEL=y # end of Apple SoC drivers # @@ -6700,7 +6830,7 @@ CONFIG_EXTCON_USB_GPIO=y CONFIG_PWM=y CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set -CONFIG_PWM_APPLE=m +CONFIG_PWM_APPLE=y # CONFIG_PWM_ATMEL_TCB is not set # CONFIG_PWM_CLK is not set # CONFIG_PWM_DWC is not set @@ -6736,7 +6866,7 @@ CONFIG_RESET_CONTROLLER=y CONFIG_GENERIC_PHY=y # CONFIG_PHY_CAN_TRANSCEIVER is not set CONFIG_PHY_APPLE_ATC=m -CONFIG_PHY_APPLE_DPTX=y +CONFIG_PHY_APPLE_DPTX=m # # PHY drivers for Broadcom platforms @@ -6804,9 +6934,9 @@ CONFIG_NVMEM_LAYOUTS=y # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set # end of Layout Types -CONFIG_NVMEM_APPLE_EFUSES=m +CONFIG_NVMEM_APPLE_EFUSES=y # CONFIG_NVMEM_RMEM is not set -CONFIG_NVMEM_SPMI_MFD=m +CONFIG_NVMEM_SPMI_MFD=y # CONFIG_NVMEM_SPMI_SDAM is not set # CONFIG_NVMEM_U_BOOT_ENV is not set @@ -6828,7 +6958,7 @@ CONFIG_MULTIPLEXER=m # # CONFIG_MUX_ADG792A is not set # CONFIG_MUX_ADGS1408 is not set -# CONFIG_MUX_APPLE_DPXBAR is not set +CONFIG_MUX_APPLE_DPXBAR=m # CONFIG_MUX_GPIO is not set # CONFIG_MUX_MMIO is not set # end of Multiplexer drivers @@ -7226,7 +7356,6 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_STACK_ALL_PATTERN is not set # CONFIG_INIT_STACK_ALL_ZERO is not set -# CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y @@ -7241,8 +7370,6 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # end of Hardening of kernel data structures CONFIG_RANDSTRUCT_NONE=y -# CONFIG_RANDSTRUCT_FULL is not set -# CONFIG_RANDSTRUCT_PERFORMANCE is not set # end of Kernel hardening options # end of Security options From 231828340b32691042006dbd9257fbdede1b77ba Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 17 May 2024 13:55:48 +0200 Subject: [PATCH 23/37] enable CONFIG_RUST_PHYLIB_ABSTRACTIONS, like Fedora and Ubuntu Signed-off-by: Matthias Kurz --- linux-asahi/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-asahi/config b/linux-asahi/config index 1579e3c..99d1ab5 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -2693,7 +2693,7 @@ CONFIG_SWPHY=y CONFIG_LED_TRIGGER_PHY=y CONFIG_PHYLIB_LEDS=y CONFIG_FIXED_PHY=y -# CONFIG_RUST_PHYLIB_ABSTRACTIONS is not set +CONFIG_RUST_PHYLIB_ABSTRACTIONS=y CONFIG_SFP=m # @@ -2704,6 +2704,7 @@ CONFIG_AMD_PHY=m # CONFIG_ADIN1100_PHY is not set # CONFIG_AQUANTIA_PHY is not set CONFIG_AX88796B_PHY=m +# CONFIG_AX88796B_RUST_PHY is not set CONFIG_BROADCOM_PHY=m CONFIG_BCM54140_PHY=m CONFIG_BCM7XXX_PHY=m From ec3213dce179e4ac94a3789d7c63ad51677a39d0 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 17 May 2024 14:04:26 +0200 Subject: [PATCH 24/37] Update b2sum and sha256sum for config file Signed-off-by: Matthias Kurz --- linux-asahi/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index b0faf5e..722fa85 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -32,11 +32,11 @@ source=( 0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch ) sha256sums=('15e8837a6905324500e7cf7972e6a8b25a21897ae2b8e5003129af885a2edd2f' - '9432e63b6c631273d7ef2040703c4fd70f99f16261168dc4e1a9aae2fec2ce99' + '3f6db44b91ae15d2522909f8705586b130561be96414b750d0eca96240cf17b4' 'd133d00c2198673b5f8a37249ea936a466dc98050a7b6b0767d7a6dfc42d8541' '95408f3b1cc8842e12ffaa3ce41ada149ee32fd5bd2bbafa95449388a37cef7c') b2sums=('5a08d3df1d0e1fc274a68f29ab592c790421d58dafa5533b7f526f13c5046d668e0c864b9a71f2c5b736a1890a65ba0877694b11bbde9acf5ff873f7a8a5a167' - '4353850ca1b12cd8eb8176b83973274ef802ac5625ad04918d0d90212305b750051cd93b286e45db723aaddd2421cecd133bbb94ae7c5ee56b2d5d5d0d2e072d' + 'ce72a0ca6f4e0b6b126fab07bcdb9da355467bacefc4f4ae905add8262901bc7526963b25465cda5d1c44c28caf92f233d3476dfee78980ddffaa2ed97ec8b74' '2e0015cfb2aea1b4bc2da796f4a40c7d9ac21baf08aae572d28ecc4f0f399141072df42acb598176cfb06c6184dadc1ccfbf8a2a8b4e9085759260e800068e26' '2b0481f336dbf33c3909ac16a9b3ab8b425a31a085746730648910a00b8fabf90ba3988e4bb04d9c8801e1b100c6ecba858c191a2fab00c0af51f931c26a515d') export KBUILD_BUILD_HOST=archlinux From e866eb73f76c2463f020d683d621dd032fc268a4 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Fri, 17 May 2024 23:20:59 +0200 Subject: [PATCH 25/37] bump kernel to 6.8.9-6 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 8 ++++---- linux-asahi/config | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 722fa85..08c4c16 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,8 +5,8 @@ buildarch=8 _rcver=6.8.9 #_rcrel=3 -_asahirel=5 -pkgrel=2 +_asahirel=6 +pkgrel=1 _m1n1_version=1.4.11 @@ -31,11 +31,11 @@ source=( 0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch 0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch ) -sha256sums=('15e8837a6905324500e7cf7972e6a8b25a21897ae2b8e5003129af885a2edd2f' +sha256sums=('1155857d7b9bae66922c273dad6995984ca0fa8de576d82de752394d82d19e3c' '3f6db44b91ae15d2522909f8705586b130561be96414b750d0eca96240cf17b4' 'd133d00c2198673b5f8a37249ea936a466dc98050a7b6b0767d7a6dfc42d8541' '95408f3b1cc8842e12ffaa3ce41ada149ee32fd5bd2bbafa95449388a37cef7c') -b2sums=('5a08d3df1d0e1fc274a68f29ab592c790421d58dafa5533b7f526f13c5046d668e0c864b9a71f2c5b736a1890a65ba0877694b11bbde9acf5ff873f7a8a5a167' +b2sums=('2e2880e21d40f6810f27dc9af4e4f081de3e287cb390beb10d518a8bc9589cc0a93f64c36b736834682f775b9f0d621e4b14ca0bfcbf99cd6b5920b4c91b4958' 'ce72a0ca6f4e0b6b126fab07bcdb9da355467bacefc4f4ae905add8262901bc7526963b25465cda5d1c44c28caf92f233d3476dfee78980ddffaa2ed97ec8b74' '2e0015cfb2aea1b4bc2da796f4a40c7d9ac21baf08aae572d28ecc4f0f399141072df42acb598176cfb06c6184dadc1ccfbf8a2a8b4e9085759260e800068e26' '2b0481f336dbf33c3909ac16a9b3ab8b425a31a085746730648910a00b8fabf90ba3988e4bb04d9c8801e1b100c6ecba858c191a2fab00c0af51f931c26a515d') diff --git a/linux-asahi/config b/linux-asahi/config index 99d1ab5..f38a007 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -273,9 +273,9 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_RUST=y -CONFIG_RUSTC_VERSION_TEXT="rustc 1.78.0 (9b00956e5 2024-04-29) (Arch Linux rust 1:1.78.0-1)" +CONFIG_RUSTC_VERSION_TEXT="rustc 1.76.0 (07dca489a 2024-02-04)" CONFIG_RUSTC_LLVM_VERSION_TEXT="17.0.6" -CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.69.4" +CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.65.1" # # Kexec and crash features From a7103738a36f50632eac599dd5f9435b627f82f1 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Sat, 18 May 2024 00:56:56 +0200 Subject: [PATCH 26/37] bump m1n1 to 1.4.13 Signed-off-by: Jos Dehaes --- m1n1/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/m1n1/PKGBUILD b/m1n1/PKGBUILD index fb96873..1369069 100644 --- a/m1n1/PKGBUILD +++ b/m1n1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Hector Martin pkgname=m1n1 -pkgver=1.4.12 +pkgver=1.4.13 pkgrel=1 pkgdesc='Asahi Linux bootloader' _artwork_commit_id=35626c31f5c5a8a884aaff93f864795026495742 @@ -17,9 +17,9 @@ source=( "m1n1-${_m1n1_commit_id}.tar.gz::https://github.com/AsahiLinux/m1n1/archive/${_m1n1_commit_id}.tar.gz" ) sha256sums=('ffa129b5cae8debd4ffd97f7f1ac7f571c7ba4679793cd138918c2ae76a7103d' - '1e96b0c1c75e5af37031477c7dfe1a472fa2ec9f383a4bd7a8f7891b86646ccb') + '1a3e113c5794d54233159e2b906a02a644e24000671f90b05a24f248b599a402') b2sums=('26e9668f7c7393fec24b53b184ea0eabed4f46479c1aab26728d01c179091683cc4387ff83796bdcbb289376236faf9f651197b9fbba51e52540e58ebdc8bcc5' - '2c192294daaeb9371e98d1cda596e7fbadc3cb35021fbc527f70a1a8076f84afe391190a620deb007e837f1a97b1fe9ca36bc194d1173debaff3c9f269a3f4f9') + '1696df24a5a36667165c041be0f8f98b28d719d5571f9e7acd91eaf803fc0dc25fae1ccc74e5f74f940d1452c1db6727d8d2d59f7806586d5de8407f2b1c5d80') prepare() { rm -rf "${srcdir}/$_m1n1_srcname"/artwork From 42daea196852e8f127b36455d536977a642cbca1 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Sat, 18 May 2024 21:57:34 +0200 Subject: [PATCH 27/37] bump m1n1 to 1.4.14 Signed-off-by: Jos Dehaes --- m1n1/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/m1n1/PKGBUILD b/m1n1/PKGBUILD index 1369069..6e61e7a 100644 --- a/m1n1/PKGBUILD +++ b/m1n1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Hector Martin pkgname=m1n1 -pkgver=1.4.13 +pkgver=1.4.14 pkgrel=1 pkgdesc='Asahi Linux bootloader' _artwork_commit_id=35626c31f5c5a8a884aaff93f864795026495742 @@ -17,9 +17,9 @@ source=( "m1n1-${_m1n1_commit_id}.tar.gz::https://github.com/AsahiLinux/m1n1/archive/${_m1n1_commit_id}.tar.gz" ) sha256sums=('ffa129b5cae8debd4ffd97f7f1ac7f571c7ba4679793cd138918c2ae76a7103d' - '1a3e113c5794d54233159e2b906a02a644e24000671f90b05a24f248b599a402') + '61871dd2d26531b4e07f9b3db0516b580f836c35e162de4799b4e556e8698119') b2sums=('26e9668f7c7393fec24b53b184ea0eabed4f46479c1aab26728d01c179091683cc4387ff83796bdcbb289376236faf9f651197b9fbba51e52540e58ebdc8bcc5' - '1696df24a5a36667165c041be0f8f98b28d719d5571f9e7acd91eaf803fc0dc25fae1ccc74e5f74f940d1452c1db6727d8d2d59f7806586d5de8407f2b1c5d80') + '9551175345947abd0890943795893fb4b9b88cbf6d262305e1a0ec56531493411930cbda6f649f7bbea90239640ccd95b96b4a310cc12bc74944983ddf5e7b97') prepare() { rm -rf "${srcdir}/$_m1n1_srcname"/artwork From e46fc8bbe712e36fa5027af1e806de357eb25cd3 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Tue, 21 May 2024 10:57:44 +0200 Subject: [PATCH 28/37] fix checksums Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 08c4c16..484d534 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -6,7 +6,7 @@ buildarch=8 _rcver=6.8.9 #_rcrel=3 _asahirel=6 -pkgrel=1 +pkgrel=2 _m1n1_version=1.4.11 @@ -32,11 +32,11 @@ source=( 0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch ) sha256sums=('1155857d7b9bae66922c273dad6995984ca0fa8de576d82de752394d82d19e3c' - '3f6db44b91ae15d2522909f8705586b130561be96414b750d0eca96240cf17b4' + 'fc66eda26c5d3f44fbdc1a6275db1d2c3234d462d1d779b7f03be6fbc2ca6600' 'd133d00c2198673b5f8a37249ea936a466dc98050a7b6b0767d7a6dfc42d8541' '95408f3b1cc8842e12ffaa3ce41ada149ee32fd5bd2bbafa95449388a37cef7c') b2sums=('2e2880e21d40f6810f27dc9af4e4f081de3e287cb390beb10d518a8bc9589cc0a93f64c36b736834682f775b9f0d621e4b14ca0bfcbf99cd6b5920b4c91b4958' - 'ce72a0ca6f4e0b6b126fab07bcdb9da355467bacefc4f4ae905add8262901bc7526963b25465cda5d1c44c28caf92f233d3476dfee78980ddffaa2ed97ec8b74' + 'b0d2441769fc170097592ab155f978c39a61f50d293897aef070505c1dd6f3679b2f3381d70138a7b04ff87a88260bf7a972d4ad0277ff51675ee704c96388c7' '2e0015cfb2aea1b4bc2da796f4a40c7d9ac21baf08aae572d28ecc4f0f399141072df42acb598176cfb06c6184dadc1ccfbf8a2a8b4e9085759260e800068e26' '2b0481f336dbf33c3909ac16a9b3ab8b425a31a085746730648910a00b8fabf90ba3988e4bb04d9c8801e1b100c6ecba858c191a2fab00c0af51f931c26a515d') export KBUILD_BUILD_HOST=archlinux From 23af94b840ce522a50ecdd95f03139e17349a81f Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Wed, 22 May 2024 22:32:35 +0200 Subject: [PATCH 29/37] add rust toolchain file Signed-off-by: Jos Dehaes --- linux-asahi/rust-toolchain.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 linux-asahi/rust-toolchain.toml diff --git a/linux-asahi/rust-toolchain.toml b/linux-asahi/rust-toolchain.toml new file mode 100644 index 0000000..492bb76 --- /dev/null +++ b/linux-asahi/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.76.0" +components = ["rustc", "cargo", "rust-src"] +targets = ["aarch64-unknown-linux-gnu"] From 3b9e391d38ce44dcb11a2afd857715d7d4add28c Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Wed, 22 May 2024 22:32:52 +0200 Subject: [PATCH 30/37] bump to 6.8.9-7 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 484d534..b099be3 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -5,10 +5,10 @@ buildarch=8 _rcver=6.8.9 #_rcrel=3 -_asahirel=6 -pkgrel=2 +_asahirel=7 +pkgrel=1 -_m1n1_version=1.4.11 +_m1n1_version=1.4.14 pkgbase=linux-asahi #_commit_id=asahi-${_nextver}-${_asahirel} @@ -31,11 +31,11 @@ source=( 0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch 0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch ) -sha256sums=('1155857d7b9bae66922c273dad6995984ca0fa8de576d82de752394d82d19e3c' +sha256sums=('ccf6b63d071e917ca6136550813e65b72314bb47a0d95f3dcdad9d34d53db1a9' 'fc66eda26c5d3f44fbdc1a6275db1d2c3234d462d1d779b7f03be6fbc2ca6600' 'd133d00c2198673b5f8a37249ea936a466dc98050a7b6b0767d7a6dfc42d8541' '95408f3b1cc8842e12ffaa3ce41ada149ee32fd5bd2bbafa95449388a37cef7c') -b2sums=('2e2880e21d40f6810f27dc9af4e4f081de3e287cb390beb10d518a8bc9589cc0a93f64c36b736834682f775b9f0d621e4b14ca0bfcbf99cd6b5920b4c91b4958' +b2sums=('38c3314c89fdf21be35cf3b76de6050e57f55887ea13e30501f405f0bd79423526d546515df2d9db6368b6157629132f16cafb2ce44d97798e6a82bc2674412f' 'b0d2441769fc170097592ab155f978c39a61f50d293897aef070505c1dd6f3679b2f3381d70138a7b04ff87a88260bf7a972d4ad0277ff51675ee704c96388c7' '2e0015cfb2aea1b4bc2da796f4a40c7d9ac21baf08aae572d28ecc4f0f399141072df42acb598176cfb06c6184dadc1ccfbf8a2a8b4e9085759260e800068e26' '2b0481f336dbf33c3909ac16a9b3ab8b425a31a085746730648910a00b8fabf90ba3988e4bb04d9c8801e1b100c6ecba858c191a2fab00c0af51f931c26a515d') From b69532a9ead379d3f843cf028f75df6790e16a94 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Tue, 28 May 2024 11:00:00 +0200 Subject: [PATCH 31/37] bump to 6.8.10-4 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 12 ++++++------ linux-asahi/config | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index b099be3..e332dbe 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -3,9 +3,9 @@ buildarch=8 -_rcver=6.8.9 +_rcver=6.8.10 #_rcrel=3 -_asahirel=7 +_asahirel=4 pkgrel=1 _m1n1_version=1.4.14 @@ -31,12 +31,12 @@ source=( 0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch 0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch ) -sha256sums=('ccf6b63d071e917ca6136550813e65b72314bb47a0d95f3dcdad9d34d53db1a9' - 'fc66eda26c5d3f44fbdc1a6275db1d2c3234d462d1d779b7f03be6fbc2ca6600' +sha256sums=('6f339c96854b94d915864fd5d38712c63476bdbf65ca331de411309b40bf268f' + 'dd1b9677a1e9255183c12cdc6195cf48dce523222144626819a5ff525ae04af8' 'd133d00c2198673b5f8a37249ea936a466dc98050a7b6b0767d7a6dfc42d8541' '95408f3b1cc8842e12ffaa3ce41ada149ee32fd5bd2bbafa95449388a37cef7c') -b2sums=('38c3314c89fdf21be35cf3b76de6050e57f55887ea13e30501f405f0bd79423526d546515df2d9db6368b6157629132f16cafb2ce44d97798e6a82bc2674412f' - 'b0d2441769fc170097592ab155f978c39a61f50d293897aef070505c1dd6f3679b2f3381d70138a7b04ff87a88260bf7a972d4ad0277ff51675ee704c96388c7' +b2sums=('9bd9e9b17c40ab861b676e21bbfd07846d7e4b813c82f393a3fe52f2526638b25052238d98724390cf766a9ba29cb20d7f0d85d283e4de6c1ffbc0d6f4acd0bb' + '3b5af2cf0796219d70a756d747a62f38e2a64757791aa16254f81e6bff61261db0a1b95ebc3400cf3de0d715afa683dc487586c3abef1f744642f774178dd750' '2e0015cfb2aea1b4bc2da796f4a40c7d9ac21baf08aae572d28ecc4f0f399141072df42acb598176cfb06c6184dadc1ccfbf8a2a8b4e9085759260e800068e26' '2b0481f336dbf33c3909ac16a9b3ab8b425a31a085746730648910a00b8fabf90ba3988e4bb04d9c8801e1b100c6ecba858c191a2fab00c0af51f931c26a515d') export KBUILD_BUILD_HOST=archlinux diff --git a/linux-asahi/config b/linux-asahi/config index f38a007..a9be640 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.8.9 Kernel Configuration +# Linux/arm64 6.8.10 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240507" CONFIG_CC_IS_GCC=y @@ -7357,7 +7357,7 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_STACK_ALL_PATTERN is not set # CONFIG_INIT_STACK_ALL_ZERO is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # CONFIG_ZERO_CALL_USED_REGS is not set From b3f78f6912398cc9ea4764e4ead5e486592f610d Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Sat, 22 Jun 2024 22:38:32 +0200 Subject: [PATCH 32/37] bump to 6.9.6-1 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 27 +++---------- linux-asahi/config | 90 ++++++++++++++++++++++++++++---------------- 2 files changed, 64 insertions(+), 53 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index e332dbe..bdc56a9 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -3,9 +3,9 @@ buildarch=8 -_rcver=6.8.10 +_rcver=6.9.6 #_rcrel=3 -_asahirel=4 +_asahirel=1 pkgrel=1 _m1n1_version=1.4.14 @@ -28,17 +28,11 @@ options=('!strip') source=( https://github.com/AsahiLinux/linux/archive/${_commit_id}.tar.gz config # the main kernel config file - 0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch - 0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch ) -sha256sums=('6f339c96854b94d915864fd5d38712c63476bdbf65ca331de411309b40bf268f' - 'dd1b9677a1e9255183c12cdc6195cf48dce523222144626819a5ff525ae04af8' - 'd133d00c2198673b5f8a37249ea936a466dc98050a7b6b0767d7a6dfc42d8541' - '95408f3b1cc8842e12ffaa3ce41ada149ee32fd5bd2bbafa95449388a37cef7c') -b2sums=('9bd9e9b17c40ab861b676e21bbfd07846d7e4b813c82f393a3fe52f2526638b25052238d98724390cf766a9ba29cb20d7f0d85d283e4de6c1ffbc0d6f4acd0bb' - '3b5af2cf0796219d70a756d747a62f38e2a64757791aa16254f81e6bff61261db0a1b95ebc3400cf3de0d715afa683dc487586c3abef1f744642f774178dd750' - '2e0015cfb2aea1b4bc2da796f4a40c7d9ac21baf08aae572d28ecc4f0f399141072df42acb598176cfb06c6184dadc1ccfbf8a2a8b4e9085759260e800068e26' - '2b0481f336dbf33c3909ac16a9b3ab8b425a31a085746730648910a00b8fabf90ba3988e4bb04d9c8801e1b100c6ecba858c191a2fab00c0af51f931c26a515d') +sha256sums=('14df7abd2d7c12373e38561cbdfad8f81986a5a4cbe71c354bc9b1c0761e49ef' + '13f19fa208af9fcfd9ac442112f9f250a62d00a3cb11cd896fc8469ff0af5980') +b2sums=('e69710d1ab902f1ab5121740523930bfd9e50e35acd8c44f7a49635eadab962ae17b67f97dd2cd859ca183cf54b5e8f0298055b524b2afa9ecaccb7dc6a77727' + '30e8b7fca0de63a07ad78089ee714900492c231618de1ac127955649b129f449f71dd57372cdbf9801d9b146de18cf7d4f2ccfbbc2696f05b5d55b6b2493c847') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" @@ -49,15 +43,6 @@ prepare() { echo "Setting version..." echo "-$_asahirel-$pkgrel" > localversion.10-pkgrel - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done - echo "Creating build directories..." mkdir -p build/base diff --git a/linux-asahi/config b/linux-asahi/config index a9be640..eb99960 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.8.10 Kernel Configuration +# Linux/arm64 6.9.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240507" CONFIG_CC_IS_GCC=y @@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=126 +CONFIG_PAHOLE_VERSION=127 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -280,7 +280,7 @@ CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.65.1" # # Kexec and crash features # -CONFIG_CRASH_CORE=y +CONFIG_VMCORE_INFO=y CONFIG_KEXEC_CORE=y # CONFIG_KEXEC is not set CONFIG_KEXEC_FILE=y @@ -293,7 +293,6 @@ CONFIG_ARM64=y CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_64BIT=y CONFIG_MMU=y -CONFIG_ARM64_PAGE_SHIFT=14 CONFIG_ARM64_CONT_PTE_SHIFT=7 CONFIG_ARM64_CONT_PMD_SHIFT=5 CONFIG_ARCH_MMAP_RND_BITS_MIN=16 @@ -417,6 +416,7 @@ CONFIG_ARM64_16K_PAGES=y # CONFIG_ARM64_VA_BITS_36 is not set # CONFIG_ARM64_VA_BITS_47 is not set CONFIG_ARM64_VA_BITS_48=y +# CONFIG_ARM64_VA_BITS_52 is not set CONFIG_ARM64_VA_BITS=48 CONFIG_ARM64_PA_BITS_48=y CONFIG_ARM64_PA_BITS=48 @@ -446,7 +446,6 @@ CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y -CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y CONFIG_TRANS_TABLE=y # CONFIG_XEN is not set CONFIG_ARCH_FORCE_MAX_ORDER=11 @@ -617,7 +616,6 @@ CONFIG_ARM_APPLE_SOC_CPUFREQ=y CONFIG_ARCH_SUPPORTS_ACPI=y # CONFIG_ACPI is not set -CONFIG_HAVE_KVM=y CONFIG_KVM_COMMON=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQ_ROUTING=y @@ -626,6 +624,7 @@ CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y CONFIG_KVM_MMIO=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y @@ -717,8 +716,11 @@ CONFIG_SOFTIRQ_ON_OWN_STACK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_ARCH_MMAP_RND_BITS=18 +CONFIG_HAVE_PAGE_SIZE_16KB=y +CONFIG_PAGE_SIZE_16KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=14 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_COMPAT_32BIT_TIME=y @@ -755,6 +757,8 @@ CONFIG_HAVE_GCC_PLUGINS=y # CONFIG_GCC_PLUGINS is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT=4 +CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y +CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -881,7 +885,6 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set -# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y @@ -946,7 +949,6 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y # CONFIG_MEMORY_FAILURE is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set CONFIG_CMA_DEBUGFS=y # CONFIG_CMA_SYSFS is not set CONFIG_CMA_AREAS=7 @@ -995,7 +997,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1367,6 +1368,7 @@ CONFIG_IP_VS_PE_SIP=m # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m +CONFIG_IP_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y @@ -1399,6 +1401,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_SECURITY=m CONFIG_IP_NF_ARPTABLES=m +CONFIG_NFT_COMPAT_ARP=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # end of IP: Netfilter Configuration @@ -1406,6 +1409,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +CONFIG_IP6_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y @@ -1443,6 +1447,7 @@ CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_CONNTRACK_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1639,7 +1644,6 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -1898,6 +1902,7 @@ CONFIG_ETHTOOL_NETLINK=y # CONFIG_ARM_AMBA=y CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS_GENERIC=y @@ -2178,7 +2183,6 @@ CONFIG_MTD_CFI_UTIL=m # # CONFIG_MTD_COMPLEX_MAPPINGS is not set # CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_INTEL_VR_NOR is not set # CONFIG_MTD_PLATRAM is not set # end of Mapping drivers for chip access @@ -2508,6 +2512,7 @@ CONFIG_DM_LOG_WRITES=m CONFIG_DM_INTEGRITY=m CONFIG_DM_ZONED=m CONFIG_DM_AUDIT=y +# CONFIG_DM_VDO is not set CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m @@ -2736,7 +2741,11 @@ CONFIG_NATIONAL_PHY=m # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_NCN26000_PHY is not set +CONFIG_QCOM_NET_PHYLIB=y CONFIG_AT803X_PHY=y +# CONFIG_QCA83XX_PHY is not set +# CONFIG_QCA808X_PHY is not set +# CONFIG_QCA807X_PHY is not set CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=y # CONFIG_RENESAS_PHY is not set @@ -3175,6 +3184,8 @@ CONFIG_TOUCHSCREEN_APPLE_Z2=m # CONFIG_TOUCHSCREEN_EXC3000 is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set @@ -3275,7 +3286,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -3515,6 +3525,7 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=m CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set # CONFIG_PTP_1588_CLOCK_IDTCM is not set +# CONFIG_PTP_1588_CLOCK_FC3W is not set # CONFIG_PTP_1588_CLOCK_MOCK is not set # end of PTP clock support @@ -3524,6 +3535,7 @@ CONFIG_PINMUX=y CONFIG_GENERIC_PINMUX_FUNCTIONS=y # CONFIG_DEBUG_PINCTRL is not set CONFIG_PINCTRL_APPLE_GPIO=y +# CONFIG_PINCTRL_AW9523 is not set # CONFIG_PINCTRL_CY8C95X0 is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set @@ -3708,8 +3720,10 @@ CONFIG_HWMON=y # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set # CONFIG_SENSORS_AS370 is not set # CONFIG_SENSORS_ASC7621 is not set +# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set # CONFIG_SENSORS_AXI_FAN_CONTROL is not set # CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_CHIPCAP2 is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set # CONFIG_SENSORS_CORSAIR_PSU is not set # CONFIG_SENSORS_DS620 is not set @@ -3744,6 +3758,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_LTC4245 is not set # CONFIG_SENSORS_LTC4260 is not set # CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_LTC4282 is not set # CONFIG_SENSORS_MAX1111 is not set # CONFIG_SENSORS_MAX127 is not set # CONFIG_SENSORS_MAX16065 is not set @@ -3792,10 +3807,12 @@ CONFIG_HWMON=y # CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_NPCM7XX is not set # CONFIG_SENSORS_NZXT_KRAKEN2 is not set +# CONFIG_SENSORS_NZXT_KRAKEN3 is not set # CONFIG_SENSORS_NZXT_SMART2 is not set # CONFIG_SENSORS_OCC_P8_I2C is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_PMBUS is not set +# CONFIG_SENSORS_PT5161L is not set # CONFIG_SENSORS_PWM_FAN is not set # CONFIG_SENSORS_SBTSI is not set # CONFIG_SENSORS_SBRMI is not set @@ -3853,7 +3870,6 @@ CONFIG_THERMAL=y CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -4991,8 +5007,7 @@ CONFIG_DVB_SP2=m # Graphics support # CONFIG_APERTURE_HELPERS=y -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_VIDEO=y # CONFIG_AUXDISPLAY is not set CONFIG_DRM=y CONFIG_DRM_MIPI_DSI=y @@ -5057,15 +5072,15 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set # CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set +# CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set -# CONFIG_DRM_PANEL_DSI_CM is not set -# CONFIG_DRM_PANEL_LVDS is not set -CONFIG_DRM_PANEL_SIMPLE=m -# CONFIG_DRM_PANEL_EDP is not set # CONFIG_DRM_PANEL_EBBG_FT8719 is not set # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set +# CONFIG_DRM_PANEL_DSI_CM is not set +# CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_HIMAX_HX83112A is not set # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set @@ -5075,17 +5090,17 @@ CONFIG_DRM_PANEL_SIMPLE=m # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set -# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_LPM102A188A is not set +# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_R63452 is not set # CONFIG_DRM_PANEL_KHADAS_TS050 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set -# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set @@ -5094,8 +5109,8 @@ CONFIG_DRM_PANEL_SIMPLE=m # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set +# CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set -# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set @@ -5106,15 +5121,16 @@ CONFIG_DRM_PANEL_SIMPLE=m # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set +# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set @@ -5125,19 +5141,21 @@ CONFIG_DRM_PANEL_SIMPLE=m # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set -# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set # CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set +# CONFIG_DRM_PANEL_EDP is not set +CONFIG_DRM_PANEL_SIMPLE=m +# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set +# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set -# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels @@ -5197,7 +5215,6 @@ CONFIG_DRM_BOCHS=y # CONFIG_DRM_GM12U320 is not set # CONFIG_DRM_PANEL_MIPI_DBI is not set CONFIG_DRM_SIMPLEDRM=y -# CONFIG_DRM_SIMPLEDRM_BACKLIGHT is not set # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9163 is not set # CONFIG_TINYDRM_ILI9225 is not set @@ -5295,6 +5312,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_OTM3225A is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_KTD253 is not set +# CONFIG_BACKLIGHT_KTD2801 is not set # CONFIG_BACKLIGHT_KTZ8866 is not set # CONFIG_BACKLIGHT_PWM is not set # CONFIG_BACKLIGHT_QCOM_WLED is not set @@ -5865,6 +5883,7 @@ CONFIG_USB_OTG=y # CONFIG_USB_OTG_FSM is not set # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_MON=m # @@ -6192,6 +6211,7 @@ CONFIG_TYPEC_TPS6598X=m # CONFIG_TYPEC_MUX_FSA4480 is not set # CONFIG_TYPEC_MUX_GPIO_SBU is not set # CONFIG_TYPEC_MUX_PI3USB30532 is not set +# CONFIG_TYPEC_MUX_IT5205 is not set # CONFIG_TYPEC_MUX_NB7VPQ904M is not set # CONFIG_TYPEC_MUX_PTN36502 is not set # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set @@ -6262,8 +6282,6 @@ CONFIG_LEDS_CLASS_FLASH=m CONFIG_LEDS_GPIO=m # CONFIG_LEDS_LP3944 is not set # CONFIG_LEDS_LP3952 is not set -# CONFIG_LEDS_LP50XX is not set -# CONFIG_LEDS_LP55XX_COMMON is not set # CONFIG_LEDS_LP8860 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set @@ -6534,6 +6552,7 @@ CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_PCI_MMAP=y CONFIG_VFIO_PCI_INTX=y CONFIG_VFIO_PCI=m +# CONFIG_NVGRACE_GPU_VFIO_PCI is not set # end of VFIO support for PCI devices # @@ -6603,7 +6622,6 @@ CONFIG_STAGING_MEDIA=y # StarFive media platform drivers # # CONFIG_STAGING_MEDIA_DEPRECATED is not set -# CONFIG_STAGING_BOARD is not set # CONFIG_LTE_GDM724X is not set # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set @@ -6760,6 +6778,7 @@ CONFIG_APPLE_DOCKCHANNEL=y # # Qualcomm SoC drivers # +# CONFIG_QCOM_PBS is not set # end of Qualcomm SoC drivers # CONFIG_SOC_TI is not set @@ -6857,6 +6876,7 @@ CONFIG_APPLE_AIC=y # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_GPIO is not set # CONFIG_RESET_SIMPLE is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESET_TI_TPS380X is not set @@ -7055,6 +7075,7 @@ CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m # CONFIG_VIRTIO_FS is not set +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -7091,11 +7112,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" # CONFIG_FAT_DEFAULT_UTF8 is not set CONFIG_EXFAT_FS=m CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_NTFS_FS is not set CONFIG_NTFS3_FS=m # CONFIG_NTFS3_64BIT_CLUSTER is not set CONFIG_NTFS3_LZX_XPRESS=y # CONFIG_NTFS3_FS_POSIX_ACL is not set +# CONFIG_NTFS_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems # @@ -7389,6 +7410,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG=y CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y @@ -7648,7 +7670,6 @@ CONFIG_GENERIC_NET_UTILS=y CONFIG_CORDIC=m # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y @@ -7869,7 +7890,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KCSAN=y CONFIG_HAVE_KCSAN_COMPILER=y @@ -7913,9 +7934,14 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y # CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y +CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y +CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_KASAN_SW_TAGS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +# CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y # CONFIG_KFENCE is not set # end of Memory Debugging From ef9834518d3f722c8c9290fd80e397595d76347b Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Sat, 22 Jun 2024 22:45:38 +0200 Subject: [PATCH 33/37] remove unneeded patches Signed-off-by: Jos Dehaes --- ...AGE-macaudio-Enable-first-round-of-m.patch | 82 ------------------- ...AGE-macaudio-Enable-second-round-of-.patch | 51 ------------ linux-asahi/PKGBUILD | 2 +- 3 files changed, 1 insertion(+), 134 deletions(-) delete mode 100644 linux-asahi/0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch delete mode 100644 linux-asahi/0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch diff --git a/linux-asahi/0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch b/linux-asahi/0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch deleted file mode 100644 index 4577a6f..0000000 --- a/linux-asahi/0001-READ-COMMIT-MESSAGE-macaudio-Enable-first-round-of-m.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 385ea7b5023486aba7919cec8b6b3f6a843a1013 Mon Sep 17 00:00:00 2001 -From: Hector Martin -Date: Fri, 15 Dec 2023 20:38:32 +0900 -Subject: [PATCH 1/2] READ COMMIT MESSAGE! macaudio: Enable first round of - models - -Enables j313, j293, j493, j314, j414, j274, j375, j473, j474, j475 - -*** WARNING FOR DISTRO PACKAGERS WANTING TO APPLY THIS: *** -*** YOU ABSOLUTELY NEED THIS PATCH IN YOUR LSP-PLUGINS PACKAGE *** - -https://github.com/lsp-plugins/lsp-dsp-lib/pull/20 - -Do NOT enable speakers without that patch, on any model. It can/will -result in nasty noise that could damage them. - -Signed-off-by: Hector Martin ---- - sound/soc/apple/macaudio.c | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/sound/soc/apple/macaudio.c b/sound/soc/apple/macaudio.c -index f5b349057a67..d2ced87e88c0 100644 ---- a/sound/soc/apple/macaudio.c -+++ b/sound/soc/apple/macaudio.c -@@ -1490,23 +1490,27 @@ struct macaudio_platform_cfg macaudio_j180_cfg = { - false, AMP_SN012776, SPKR_1W1T, false, 10, -20, - }; - struct macaudio_platform_cfg macaudio_j274_cfg = { -- false, AMP_TAS5770, SPKR_1W, false, 20, -20, -+ true, AMP_TAS5770, SPKR_1W, false, 20, -20, - }; - - struct macaudio_platform_cfg macaudio_j293_cfg = { -- false, AMP_TAS5770, SPKR_2W, true, 15, -20, -+ true, AMP_TAS5770, SPKR_2W, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_j313_cfg = { -- false, AMP_TAS5770, SPKR_1W, true, 10, -20, -+ true, AMP_TAS5770, SPKR_1W, true, 10, -20, - }; - --struct macaudio_platform_cfg macaudio_j314_j316_cfg = { -+struct macaudio_platform_cfg macaudio_j314_cfg = { -+ true, AMP_SN012776, SPKR_2W1T, true, 15, -20, -+}; -+ -+struct macaudio_platform_cfg macaudio_j316_cfg = { - false, AMP_SN012776, SPKR_2W1T, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = { -- false, AMP_SN012776, SPKR_1W, false, 20, -20, -+ true, AMP_SN012776, SPKR_1W, false, 20, -20, - }; - - struct macaudio_platform_cfg macaudio_j413_cfg = { -@@ -1522,7 +1526,7 @@ struct macaudio_platform_cfg macaudio_j45x_cfg = { - }; - - struct macaudio_platform_cfg macaudio_j493_cfg = { -- false, AMP_SN012776, SPKR_2W, true, 15, -20, -+ true, AMP_SN012776, SPKR_2W, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_fallback_cfg = { -@@ -1558,9 +1562,9 @@ static const struct of_device_id macaudio_snd_device_id[] = { - /* j313 AID4 tas5770 10 2× 1W */ - { .compatible = "apple,j313-macaudio", .data = &macaudio_j313_cfg }, - /* j314 AID8 sn012776 15 2× 2W+1T */ -- { .compatible = "apple,j314-macaudio", .data = &macaudio_j314_j316_cfg }, -+ { .compatible = "apple,j314-macaudio", .data = &macaudio_j314_cfg }, - /* j316 AID9 sn012776 15 2× 2W+1T */ -- { .compatible = "apple,j316-macaudio", .data = &macaudio_j314_j316_cfg }, -+ { .compatible = "apple,j316-macaudio", .data = &macaudio_j316_cfg }, - /* j375 AID10 sn012776 15 1× 1W */ - { .compatible = "apple,j375-macaudio", .data = &macaudio_j37x_j47x_cfg }, - /* j413 AID13 sn012776 15 2× 1W+1T */ --- -2.45.0 - diff --git a/linux-asahi/0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch b/linux-asahi/0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch deleted file mode 100644 index 2355c68..0000000 --- a/linux-asahi/0002-READ-COMMIT-MESSAGE-macaudio-Enable-second-round-of-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6a24102c06c95951ab992e2d41336cc6d4bfdf23 Mon Sep 17 00:00:00 2001 -From: Hector Martin -Date: Fri, 15 Dec 2023 20:40:53 +0900 -Subject: [PATCH 2/2] READ COMMIT MESSAGE! macaudio: Enable second round of - models - -Enables j316, j413, j415, j416 - -*** WARNING FOR DISTRO PACKAGERS WANTING TO APPLY THIS: *** -*** YOU ABSOLUTELY NEED THIS PATCH IN YOUR LSP-PLUGINS PACKAGE *** - -https://github.com/lsp-plugins/lsp-dsp-lib/pull/20 - -Do NOT enable speakers without that patch, on any model. It can/will -result in nasty noise that could damage them. - -Signed-off-by: Hector Martin ---- - sound/soc/apple/macaudio.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sound/soc/apple/macaudio.c b/sound/soc/apple/macaudio.c -index d2ced87e88c0..f347f08b7ad0 100644 ---- a/sound/soc/apple/macaudio.c -+++ b/sound/soc/apple/macaudio.c -@@ -1506,7 +1506,7 @@ struct macaudio_platform_cfg macaudio_j314_cfg = { - }; - - struct macaudio_platform_cfg macaudio_j316_cfg = { -- false, AMP_SN012776, SPKR_2W1T, true, 15, -20, -+ true, AMP_SN012776, SPKR_2W1T, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = { -@@ -1514,11 +1514,11 @@ struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = { - }; - - struct macaudio_platform_cfg macaudio_j413_cfg = { -- false, AMP_SN012776, SPKR_1W1T, true, 15, -20, -+ true, AMP_SN012776, SPKR_1W1T, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_j415_cfg = { -- false, AMP_SN012776, SPKR_2W1T, true, 15, -20, -+ true, AMP_SN012776, SPKR_2W1T, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_j45x_cfg = { --- -2.45.0 - diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index bdc56a9..23224d8 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -6,7 +6,7 @@ buildarch=8 _rcver=6.9.6 #_rcrel=3 _asahirel=1 -pkgrel=1 +pkgrel=2 _m1n1_version=1.4.14 From 42afae8c0c27efad565957f5213e096ef971c7bf Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Sat, 22 Jun 2024 22:49:31 +0200 Subject: [PATCH 34/37] add back patch section Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 23224d8..f3baafa 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -6,7 +6,7 @@ buildarch=8 _rcver=6.9.6 #_rcrel=3 _asahirel=1 -pkgrel=2 +pkgrel=3 _m1n1_version=1.4.14 @@ -43,6 +43,15 @@ prepare() { echo "Setting version..." echo "-$_asahirel-$pkgrel" > localversion.10-pkgrel + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + echo "Applying patch $src..." + patch -Np1 < "../$src" + done + echo "Creating build directories..." mkdir -p build/base From 14913f3d5a3e17f61303424f0a16c80581551138 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Tue, 2 Jul 2024 11:34:37 +0200 Subject: [PATCH 35/37] bump to 6.9.7-1 Signed-off-by: Jos Dehaes --- linux-asahi/PKGBUILD | 12 ++++++------ linux-asahi/config | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index f3baafa..3222e03 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -3,10 +3,10 @@ buildarch=8 -_rcver=6.9.6 +_rcver=6.9.7 #_rcrel=3 _asahirel=1 -pkgrel=3 +pkgrel=1 _m1n1_version=1.4.14 @@ -29,10 +29,10 @@ source=( https://github.com/AsahiLinux/linux/archive/${_commit_id}.tar.gz config # the main kernel config file ) -sha256sums=('14df7abd2d7c12373e38561cbdfad8f81986a5a4cbe71c354bc9b1c0761e49ef' - '13f19fa208af9fcfd9ac442112f9f250a62d00a3cb11cd896fc8469ff0af5980') -b2sums=('e69710d1ab902f1ab5121740523930bfd9e50e35acd8c44f7a49635eadab962ae17b67f97dd2cd859ca183cf54b5e8f0298055b524b2afa9ecaccb7dc6a77727' - '30e8b7fca0de63a07ad78089ee714900492c231618de1ac127955649b129f449f71dd57372cdbf9801d9b146de18cf7d4f2ccfbbc2696f05b5d55b6b2493c847') +sha256sums=('973a9b979ae7804933542f8627b80ea50297a95641c90d06fa0b097b1c7b0ae6' + '592d0dac07b8ebfd51b28780706945a27516304fc04cd6ae16542dca2a7f819a') +b2sums=('d8311e6428bd0bd3a868a9b3089f97f34aabc615339bc5319efc1218e031c5f7fdd3ea254acb27906532b27837570450949450c3c496a1f6e7684239f1a33694' + '69ae35ea4a44d809b4c748b5e150414c1fefb67b8f101ad4b01ab03878212843bd31cfc07a9c498bc6437ed2a0cc2e594017d91fd5f9ba515436e701b9a5171f') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" diff --git a/linux-asahi/config b/linux-asahi/config index eb99960..61123f5 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.9.6 Kernel Configuration +# Linux/arm64 6.9.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240507" CONFIG_CC_IS_GCC=y @@ -5020,6 +5020,8 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=y +CONFIG_DRM_EXEC=y +CONFIG_DRM_GPUVM=y CONFIG_DRM_VRAM_HELPER=y CONFIG_DRM_TTM_HELPER=y CONFIG_DRM_GEM_DMA_HELPER=m @@ -5051,6 +5053,7 @@ CONFIG_DRM_SCHED=y # CONFIG_DRM_VKMS is not set CONFIG_RUST_DRM_SCHED=y CONFIG_RUST_DRM_GEM_SHMEM_HELPER=y +CONFIG_RUST_DRM_GPUVM=y CONFIG_RUST_APPLE_RTKIT=y CONFIG_DRM_ASAHI=y # CONFIG_DRM_ASAHI_DEBUG_ALLOCATOR is not set From 802254719ffb45de97f14e118011534b3df21d79 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 26 Jul 2024 13:15:16 +0200 Subject: [PATCH 36/37] bump to 6.9.11-1 Signed-off-by: Matthias Kurz --- linux-asahi/PKGBUILD | 10 +++++----- linux-asahi/config | 11 +++++------ linux-asahi/rust-toolchain.toml | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 3222e03..169769c 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -3,7 +3,7 @@ buildarch=8 -_rcver=6.9.7 +_rcver=6.9.11 #_rcrel=3 _asahirel=1 pkgrel=1 @@ -29,10 +29,10 @@ source=( https://github.com/AsahiLinux/linux/archive/${_commit_id}.tar.gz config # the main kernel config file ) -sha256sums=('973a9b979ae7804933542f8627b80ea50297a95641c90d06fa0b097b1c7b0ae6' - '592d0dac07b8ebfd51b28780706945a27516304fc04cd6ae16542dca2a7f819a') -b2sums=('d8311e6428bd0bd3a868a9b3089f97f34aabc615339bc5319efc1218e031c5f7fdd3ea254acb27906532b27837570450949450c3c496a1f6e7684239f1a33694' - '69ae35ea4a44d809b4c748b5e150414c1fefb67b8f101ad4b01ab03878212843bd31cfc07a9c498bc6437ed2a0cc2e594017d91fd5f9ba515436e701b9a5171f') +sha256sums=('d33fb31517177528bc30610247c2d00ae62308eb06e4303cef0c68833494aee1' + '0177e4b2036ce2d8e99701c924a36324a7fdb3de3d5c5732f5bc94387d544e5f') +b2sums=('8da9bc2cac8800a3b555ee81f3bd50ad4f2d75ff54058192223b8eb82c95cdfcbe0e4bae5a6b1d89adfa3001845df5b3b70c595d5cf004575115e86b19a7413d' + '6cb67ff0704a5a1fb7997b09bdc04f624660939e6d386974846f14ce79cfc5a8ea41904917399abcf45cdc6282022544cebca0b32e601a0e3a8eeb2303845a71') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" diff --git a/linux-asahi/config b/linux-asahi/config index 61123f5..5644a5f 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.9.7 Kernel Configuration +# Linux/arm64 6.9.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240507" CONFIG_CC_IS_GCC=y @@ -273,9 +273,9 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_RUST=y -CONFIG_RUSTC_VERSION_TEXT="rustc 1.76.0 (07dca489a 2024-02-04)" -CONFIG_RUSTC_LLVM_VERSION_TEXT="17.0.6" -CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.65.1" +CONFIG_RUSTC_VERSION_TEXT="rustc 1.80.0 (051478957 2024-07-21)" +CONFIG_RUSTC_LLVM_VERSION_TEXT="18.1.7" +CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.69.4" # # Kexec and crash features @@ -416,7 +416,6 @@ CONFIG_ARM64_16K_PAGES=y # CONFIG_ARM64_VA_BITS_36 is not set # CONFIG_ARM64_VA_BITS_47 is not set CONFIG_ARM64_VA_BITS_48=y -# CONFIG_ARM64_VA_BITS_52 is not set CONFIG_ARM64_VA_BITS=48 CONFIG_ARM64_PA_BITS_48=y CONFIG_ARM64_PA_BITS=48 @@ -3798,6 +3797,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_LM95234 is not set # CONFIG_SENSORS_LM95241 is not set # CONFIG_SENSORS_LM95245 is not set +CONFIG_SENSORS_MACSMC=y # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_NCT6683 is not set @@ -7797,7 +7797,6 @@ CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y -# CONFIG_FORCE_NR_CPUS is not set CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y diff --git a/linux-asahi/rust-toolchain.toml b/linux-asahi/rust-toolchain.toml index 492bb76..0299dda 100644 --- a/linux-asahi/rust-toolchain.toml +++ b/linux-asahi/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.76.0" +channel = "1.80.0" components = ["rustc", "cargo", "rust-src"] targets = ["aarch64-unknown-linux-gnu"] From 935b221a4c37e783c0964f22dabc3455462726ec Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 28 Jul 2024 19:07:02 +0200 Subject: [PATCH 37/37] Bump to 6.9.12-1 Signed-off-by: Matthias Kurz --- linux-asahi/PKGBUILD | 10 +++++----- linux-asahi/config | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux-asahi/PKGBUILD b/linux-asahi/PKGBUILD index 169769c..c4e8182 100644 --- a/linux-asahi/PKGBUILD +++ b/linux-asahi/PKGBUILD @@ -3,7 +3,7 @@ buildarch=8 -_rcver=6.9.11 +_rcver=6.9.12 #_rcrel=3 _asahirel=1 pkgrel=1 @@ -29,10 +29,10 @@ source=( https://github.com/AsahiLinux/linux/archive/${_commit_id}.tar.gz config # the main kernel config file ) -sha256sums=('d33fb31517177528bc30610247c2d00ae62308eb06e4303cef0c68833494aee1' - '0177e4b2036ce2d8e99701c924a36324a7fdb3de3d5c5732f5bc94387d544e5f') -b2sums=('8da9bc2cac8800a3b555ee81f3bd50ad4f2d75ff54058192223b8eb82c95cdfcbe0e4bae5a6b1d89adfa3001845df5b3b70c595d5cf004575115e86b19a7413d' - '6cb67ff0704a5a1fb7997b09bdc04f624660939e6d386974846f14ce79cfc5a8ea41904917399abcf45cdc6282022544cebca0b32e601a0e3a8eeb2303845a71') +sha256sums=('9b97ea144b652c041ef1366e0391485c6cdbbf8a84842cbd35767df788a6ca66' + 'c919489632ec77a59fbb6bb210940fceb2cac30e3ab80566915a581d2f8159fb') +b2sums=('b514c5df2d92403e0df5033d0e072708cdf0b913b5346a418a3b39b9f3c38e1a7656baf90fbf3a9bb67582d63a9a8090f28f5ecf8b69daecffbe52832668e033' + '2fcdbba91b905a19d1a27fd268b7f04e1ee7f8f41e9a9a0975611f00a2820120c90b02235d49255362512f4ffe7aa9f28e24856cc575ffe6a7fa54f397f90f1c') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" diff --git a/linux-asahi/config b/linux-asahi/config index 5644a5f..a16baa7 100644 --- a/linux-asahi/config +++ b/linux-asahi/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.9.11 Kernel Configuration +# Linux/arm64 6.9.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240507" CONFIG_CC_IS_GCC=y