Change efifb workaround method

That method lets us use the unpatched NixOS kernel freely! yay!
This commit is contained in:
Samuel Dionne-Riel 2021-05-30 00:45:44 -04:00
parent 87078a9f8f
commit 4fb1ebb6a2
4 changed files with 9 additions and 20 deletions

View File

@ -29,11 +29,11 @@ What's untested and not working will be listed here at some point. Maybe.
#### `rockchipdrm` and `efifb`
`CONFIG_FB_EFI` has been disabled in the customized kernel as `rockchipdrm`
will not render the VT if `efifb` is present.
This can be worked around by booting with the `efifb=off` kernel command-line.
Be careful if using the mainline kernel instead, as it will have
`CONFIG_FB_EFI` set to `y`.
This is already handled for you by this configuration. If using the generic
UEFI AArch64 iso, you will need to add the option yourself to the command-line
using GRUB.
#### *EFI* and poweroff

View File

@ -46,14 +46,6 @@ linux_latest.override({
VIDEO_HANTRO_ROCKCHIP y
'';
}
{
# When efifb is used, rockchipdrm won't render the VT.
name = "rk3399-efifb-config";
patch = null;
extraConfig = ''
FB_EFI n
'';
}
# Misc. community patches
# None are *required* for basic function.

View File

@ -46,14 +46,6 @@ linux_5_10.override({
VIDEO_HANTRO_ROCKCHIP y
'';
}
{
# When efifb is used, rockchipdrm won't render the VT.
name = "rk3399-efifb-config";
patch = null;
extraConfig = ''
FB_EFI n
'';
}
# Misc. community patches
# None are *required* for basic function.

View File

@ -41,6 +41,11 @@
"rtc_rk808"
];
boot.kernelParams = [
# Works around an issue with efifb, U-Boot and RK3399
"efifb=off"
];
services.udev.extraHwdb = lib.concatStrings [
# https://gitlab.manjaro.org/manjaro-arm/packages/community/pinebookpro-post-install/blob/master/10-usb-kbd.hwdb
''