From adc62907a68081e4786e31c0725ca5de04afd77b Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 10 Jun 2019 21:31:20 -0400 Subject: linux: Enables support for the Allwinner Display Engine 2.0 --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 61d349b7f0cb..c461de4f5a88 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -709,6 +709,9 @@ let # Bump the maximum number of CPUs to support systems like EC2 x1.* # instances and Xeon Phi. NR_CPUS = freeform "384"; + } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { + # Enables support for the Allwinner Display Engine 2.0 + SUN8I_DE2_CCU = whenAtLeast "4.13" yes; }; }; in -- cgit 1.4.1 From 390f2071df6f846f0e5ce488c3caeb03cdd43260 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 10 Jun 2019 21:33:28 -0400 Subject: sd-image-aarch64: Allows early modesetting for the Raspberry Pi This will reduce the confusion at boot, where the only thing visible is the last message from u-boot; where it looks like the Raspberry Pi is hung, while in reality it's likely resizing partitions. --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 5f7194e92a36..9930a4ff3047 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -26,6 +26,11 @@ in # Also increase the amount of CMA to ensure the virtual console on the RPi3 works. boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; + boot.initrd.availableKernelModules = [ + # Allows early (earlier) modesetting for the Raspberry Pi + "vc4" "bcm2835_dma" "i2c_bcm2835" + ]; + sdImage = { populateBootCommands = let configTxt = pkgs.writeText "config.txt" '' -- cgit 1.4.1 From 5d92d16b49ee851dfbed7fb8b47e172ab1104a20 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 15 Jun 2019 00:00:15 -0400 Subject: sd-image-aarch64: Allows early modesetting for Allwinner boards This will reduce the confusion at boot, where the only thing visible is the last message from u-boot; where it looks like the board is hung, while in reality it's likely resizing partitions. --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 9930a4ff3047..151749f396df 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -29,6 +29,8 @@ in boot.initrd.availableKernelModules = [ # Allows early (earlier) modesetting for the Raspberry Pi "vc4" "bcm2835_dma" "i2c_bcm2835" + # Allows early (earlier) modesetting for Allwinner SoCs + "sun4i_drm" "sun8i_drm_hdmi" "sun8i_mixer" ]; sdImage = { -- cgit 1.4.1