From 06ae860f1615071581120a7f06981613c67cacb3 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Sat, 23 Oct 2021 03:07:12 +0200
Subject: [PATCH] feat(rpi4): switch to mainline kernel

---
 hardware/gpu-rpi4.nix |  3 ---
 rpi4.nix              | 11 +++++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/hardware/gpu-rpi4.nix b/hardware/gpu-rpi4.nix
index 8f99fcb..a6553d1 100644
--- a/hardware/gpu-rpi4.nix
+++ b/hardware/gpu-rpi4.nix
@@ -7,7 +7,4 @@
     package = pkgs.mesa_drivers;
   };
   hardware.raspberry-pi."4".fkms-3d.enable = true;
-  boot.loader.raspberryPi.firmwareConfig = ''
-    gpu_mem=320
-  '';
 }
diff --git a/rpi4.nix b/rpi4.nix
index 329e5bc..1a07661 100644
--- a/rpi4.nix
+++ b/rpi4.nix
@@ -30,11 +30,18 @@ in with builtins; {
 
   # rpi4 base config
   boot.loader.grub.enable = false;
+  boot.loader.generic-extlinux-compatible.enable = true;
   boot.loader.raspberryPi.enable = true;
   boot.loader.raspberryPi.version = 4;
-  boot.kernelPackages = pkgs.linuxPackages_rpi4;
+  boot.loader.raspberryPi.uboot.enable = true;
+  boot.loader.raspberryPi.firmwareConfig = ''
+    gpu_mem=320
+    hdmi_group=1
+    hdmi_mode=97
+    hdmi_enable_4kp60=1
+    disable_overscan=1
+  '';
   boot.kernelParams = [ "console=ttyAMA0,115200" "console=tty1" ];
-  hardware.enableRedistributableFirmware = true;
 
   networking.domain = "home.felschr.com";