From: Thomas Glanzmann Date: Sat, 12 Mar 2022 17:46:38 +0000 (+0100) Subject: Merge branch 'master' of a.gmvl.de:/git/m1-debian X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/54511646a2984b5b66f343229541fb18a2fd38d4?hp=68d9f4415c93e076e1dcc824ba0acea077ac57ae Merge branch 'master' of a.gmvl.de:/git/m1-debian --- diff --git a/patch_kernel_config.pl b/patch_kernel_config.pl index d7f50c9..3c08b36 100644 --- a/patch_kernel_config.pl +++ b/patch_kernel_config.pl @@ -6,7 +6,7 @@ use warnings FATAL => 'all'; # This was taken from the linux-image-5.16.0-3-arm64-unsigned # Than it was copied as .config in the asahi tree # Than make olddefconfig was executed twice -my @lines = `cat /boot/config-5.17.0-rc6-asahi-next-20220301-25570-g0cf7b747744a`; +my @lines = `cat config`; chomp @lines; my %asahi_options = ( @@ -56,7 +56,7 @@ my %asahi_options = ( 'CONFIG_SPMI_APPLE' => 'y', 'CONFIG_USB_DWC3' => 'y', 'CONFIG_USB_DWC3_PCI' => 'y', - 'CONFIG_FB_EFI' => 'n', + 'CONFIG_FB_EFI' => 'y', 'CONFIG_BACKLIGHT_CLASS_DEVICE' => 'y', 'CONFIG_BACKLIGHT_GPIO' => 'm', );