diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-06-24 14:53:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 14:53:01 -0400 |
| commit | 7c819989f99962d01aef9513f3a131ffe385ab38 (patch) | |
| tree | cd2a1f6aafba53f9988a6397c8c09b749cf58737 | |
| parent | c4a12ee9c038b17785783564c7218450f67475df (diff) | |
| parent | 5d92d16b49ee851dfbed7fb8b47e172ab1104a20 (diff) | |
| download | nixlib-7c819989f99962d01aef9513f3a131ffe385ab38.tar nixlib-7c819989f99962d01aef9513f3a131ffe385ab38.tar.gz nixlib-7c819989f99962d01aef9513f3a131ffe385ab38.tar.bz2 nixlib-7c819989f99962d01aef9513f3a131ffe385ab38.tar.lz nixlib-7c819989f99962d01aef9513f3a131ffe385ab38.tar.xz nixlib-7c819989f99962d01aef9513f3a131ffe385ab38.tar.zst nixlib-7c819989f99962d01aef9513f3a131ffe385ab38.zip | |
Merge pull request #63147 from samueldr/aarch64/graphics-fixes
aarch64: misc. graphical boot fixes
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 5f7194e92a36..151749f396df 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -26,6 +26,13 @@ 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" + # Allows early (earlier) modesetting for Allwinner SoCs + "sun4i_drm" "sun8i_drm_hdmi" "sun8i_mixer" + ]; + sdImage = { populateBootCommands = let configTxt = pkgs.writeText "config.txt" '' diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e731b6a13ca7..855f854b111d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -710,6 +710,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 |