Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c4a12ee9c038
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7c819989f999
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 15, 2019

  1. linux: Enables support for the Allwinner Display Engine 2.0

    @samueldr
    samueldr committed Jun 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    iv-nn Ivann
    GPG key ID: E59EA2A26018D30B
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    adc6290 View commit details

  2. 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.
    @samueldr
    samueldr committed Jun 15, 2019
    Copy the full SHA
    390f207 View commit details

  3. 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.
    @samueldr
    samueldr committed Jun 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    iv-nn Ivann
    GPG key ID: E59EA2A26018D30B
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5d92d16 View commit details

Commits on Jun 24, 2019

  1. Merge pull request #63147 from samueldr/aarch64/graphics-fixes 

    aarch64: misc. graphical boot fixes
    @samueldr
    samueldr authored Jun 24, 2019
    Copy the full SHA
    7c81998 View commit details
Showing with 10 additions and 0 deletions.
  1. +7 −0 nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
  2. +3 −0 pkgs/os-specific/linux/kernel/common-config.nix
7 changes: 7 additions & 0 deletions nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
View file
Original file line number Diff line number Diff line change
@@ -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" ''
3 changes: 3 additions & 0 deletions pkgs/os-specific/linux/kernel/common-config.nix
View file
Original file line number Diff line number Diff line change
@@ -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