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: f7dd6951aaa2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d02c2d694eb9
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 24, 2018

  1. nixos/sd-image-aarch64.nix: Set avoid_warnings in RPi config.txt 

    Also add some comments on the existing config settings as well.
    @dezgeg
    dezgeg committed Jan 24, 2018
    Copy the full SHA
    cd2e740 View commit details

  2. nixos/sd-image-*.nix: Bring back high consoleLogLevel 

    3d040f9 removed it from installation-device.nix, but the default
loglevel is just too low for ARM and the like.
    @dezgeg
    dezgeg committed Jan 24, 2018
    Copy the full SHA
    d02c2d6 View commit details
10 changes: 10 additions & 0 deletions nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
View file
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ in
boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true;

boot.consoleLogLevel = lib.mkDefault 7;
boot.kernelPackages = pkgs.linuxPackages_latest;

# The serial ports listed here are:
@@ -42,8 +43,17 @@ in
populateBootCommands = let
configTxt = pkgs.writeText "config.txt" ''
kernel=u-boot-rpi3.bin
# Boot in 64-bit mode.
arm_control=0x200
# U-Boot used to need this to work, regardless of whether UART is actually used or not.
# TODO: check when/if this can be removed.
enable_uart=1
# Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
# when attempting to show low-voltage or overtemperature warnings.
avoid_warnings=1
'';
in ''
(cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
1 change: 1 addition & 0 deletions nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
View file
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ in
boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true;

boot.consoleLogLevel = lib.mkDefault 7;
boot.kernelPackages = pkgs.linuxPackages_latest;
# The serial ports listed here are:
# - ttyS0: for Tegra (Jetson TK1)
1 change: 1 addition & 0 deletions nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
View file
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ in
boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true;

boot.consoleLogLevel = lib.mkDefault 7;
boot.kernelPackages = pkgs.linuxPackages_rpi;

# FIXME: this probably should be in installation-device.nix