put all -edge config in base too

AsahiLinux · Dec 1, 2023 · 3d0f9e0 · 3d0f9e0
1 parent 111d30e
commit 3d0f9e0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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