From b72c683304795967bb040e8888cebb080509df5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 May 2021 09:32:03 +0200 Subject: [PATCH 1/4] Add Rpi4 --- README.md | 1 + flake.nix | 1 + raspberry-pi/4/default.nix | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 raspberry-pi/4/default.nix diff --git a/README.md b/README.md index 2dab83c..35c4ef2 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,7 @@ See code for all available configurations. | [MSI GS60 2QE][] | `` | | PC Engines APU | `` | | [Raspberry Pi 2][] | `` | +| [Raspberry Pi 4][] | `` | | [Samsung Series 9 NP900X3C][] | `` | | [Purism Librem 13v3][] | `` | | [Purism Librem 15v3][] | `` | diff --git a/flake.nix b/flake.nix index 570f0d2..0a16ed1 100644 --- a/flake.nix +++ b/flake.nix @@ -73,6 +73,7 @@ microsoft-surface-pro-3 = import ./microsoft/surface-pro/3; pcengines-apu = import ./pcengines/apu; raspberry-pi-2 = import ./raspberry-pi/2; + raspberry-pi-4 = import ./raspberry-pi/4; samsung-np900x3c = import ./samsung/np900x3c; system76 = import ./system76; system76-darp6 = import ./system76/darp6; diff --git a/raspberry-pi/4/default.nix b/raspberry-pi/4/default.nix new file mode 100644 index 0000000..b43e988 --- /dev/null +++ b/raspberry-pi/4/default.nix @@ -0,0 +1,30 @@ +{ lib, pkgs, ...}: + +{ + boot = { + kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi4; + initrd.availableKernelModules = [ "usbhid" "usb_storage" "vc4" ]; + + # Needed for 4K displays + kernelParams = [ "cma=128M" ]; + + loader = { + raspberryPi = { + enable = true; + version = 4; + firmwareConfig = '' + dtparam=audio=on + gpu_mem=192 + ''; + }; + grub.enable = false; + generic-extlinux-compatible.enable = true; + }; + }; + + nix.buildCores = 4; + + # Required for the Wireless firmware + hardware.enableRedistributableFirmware = true; + +} \ No newline at end of file From cdaf66c0a002baf69713ed79b94902918279d8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 12 May 2021 14:19:27 +0200 Subject: [PATCH 2/4] rpi4: remove cma --- raspberry-pi/4/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/raspberry-pi/4/default.nix b/raspberry-pi/4/default.nix index b43e988..05c8ba9 100644 --- a/raspberry-pi/4/default.nix +++ b/raspberry-pi/4/default.nix @@ -5,9 +5,6 @@ kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi4; initrd.availableKernelModules = [ "usbhid" "usb_storage" "vc4" ]; - # Needed for 4K displays - kernelParams = [ "cma=128M" ]; - loader = { raspberryPi = { enable = true; From 2b4ed534a8d3fdca224f11414ac01d3d7ea3d72c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 12 May 2021 14:37:30 +0200 Subject: [PATCH 3/4] rpi4: remove loader.raspberryPi as it's legacy --- raspberry-pi/4/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/raspberry-pi/4/default.nix b/raspberry-pi/4/default.nix index 05c8ba9..19cd71b 100644 --- a/raspberry-pi/4/default.nix +++ b/raspberry-pi/4/default.nix @@ -6,16 +6,8 @@ initrd.availableKernelModules = [ "usbhid" "usb_storage" "vc4" ]; loader = { - raspberryPi = { - enable = true; - version = 4; - firmwareConfig = '' - dtparam=audio=on - gpu_mem=192 - ''; - }; - grub.enable = false; - generic-extlinux-compatible.enable = true; + grub.enable = lib.mkDefault false; + generic-extlinux-compatible.enable = lib.mkDefault true; }; }; @@ -23,5 +15,4 @@ # Required for the Wireless firmware hardware.enableRedistributableFirmware = true; - } \ No newline at end of file From bd06334074d2189cb8651a0c1984d9c0bb37d42c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 12 May 2021 21:42:30 +0200 Subject: [PATCH 4/4] rpi4: don't override sane default for nix.buildCores MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- raspberry-pi/4/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/raspberry-pi/4/default.nix b/raspberry-pi/4/default.nix index 19cd71b..1ac0acb 100644 --- a/raspberry-pi/4/default.nix +++ b/raspberry-pi/4/default.nix @@ -11,8 +11,7 @@ }; }; - nix.buildCores = 4; # Required for the Wireless firmware hardware.enableRedistributableFirmware = true; -} \ No newline at end of file +}