check
This commit is contained in:
mjallen18
@@ -12,24 +12,6 @@ let
|
||||
applyOverlays = _final.callPackage ./apply-overlays-dtmerge.nix { };
|
||||
};
|
||||
};
|
||||
|
||||
ubootBinName = "u-boot.bin";
|
||||
|
||||
deviceTree = ({ pkgs
|
||||
, firmware
|
||||
}: pkgs.replaceVarsWith {
|
||||
src = ./generational/install-device-tree.sh;
|
||||
isExecutable = true;
|
||||
|
||||
replacements = {
|
||||
inherit (pkgs) bash;
|
||||
path = pkgs.lib.makeBinPath [
|
||||
pkgs.coreutils
|
||||
];
|
||||
|
||||
inherit firmware;
|
||||
};
|
||||
});
|
||||
|
||||
# installs raspberry's firmware independent of the nixos generations
|
||||
# sometimes referred to as "boot code"
|
||||
@@ -50,38 +32,128 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
# Builders used to write during system activation
|
||||
firmwareBuilder = import ./firmware-builder.nix {
|
||||
inherit pkgs;
|
||||
configTxt = pkgs.writeTextFile {
|
||||
name = "config.txt";
|
||||
text = ''
|
||||
# Do not edit!
|
||||
# This configuration file is generated from NixOS configuration
|
||||
# options `hardware.raspberry-pi.config`.
|
||||
# Any manual changes will be overwritten on the next configuration
|
||||
# switch.
|
||||
${config.${namespace}.hardware.raspberry-pi.config-generated}
|
||||
'';
|
||||
kernelbootGenBuilder = ({ pkgs
|
||||
, deviceTreeInstaller
|
||||
}: pkgs.replaceVarsWith {
|
||||
src = ./generational/kernelboot-gen-builder.sh;
|
||||
isExecutable = true;
|
||||
|
||||
replacements = {
|
||||
inherit (pkgs) bash;
|
||||
path = pkgs.lib.makeBinPath [
|
||||
pkgs.coreutils
|
||||
];
|
||||
|
||||
installDeviceTree = deviceTreeInstaller;
|
||||
};
|
||||
firmware = pkgs.${namespace}.raspberrypifw;
|
||||
});
|
||||
|
||||
deviceTree = ({ pkgs
|
||||
, firmware
|
||||
}: pkgs.replaceVarsWith {
|
||||
src = ./generational/install-device-tree.sh;
|
||||
isExecutable = true;
|
||||
|
||||
replacements = {
|
||||
inherit (pkgs) bash;
|
||||
path = pkgs.lib.makeBinPath [
|
||||
pkgs.coreutils
|
||||
];
|
||||
|
||||
inherit firmware;
|
||||
};
|
||||
});
|
||||
|
||||
mkBootloader = pkgs: bootloader {
|
||||
inherit pkgs;
|
||||
inherit (cfg) nixosGenerationsDir;
|
||||
|
||||
firmwareInstaller = "${raspberryPiFirmware {
|
||||
inherit pkgs;
|
||||
firmware = pkgs.${namespace}.raspberrypifw;
|
||||
configTxt = pkgs.writeTextFile {
|
||||
name = "config.txt";
|
||||
text = ''
|
||||
# Do not edit!
|
||||
# This configuration file is generated from NixOS configuration
|
||||
# options `hardware.raspberry-pi.config`.
|
||||
# Any manual changes will be overwritten on the next configuration
|
||||
# switch.
|
||||
${config.${namespace}.hardware.raspberry-pi.config-generated}
|
||||
'';
|
||||
};
|
||||
}}";
|
||||
|
||||
nixosGenBuilder = "${kernelbootGenBuilder {
|
||||
inherit pkgs;
|
||||
deviceTreeInstaller = let
|
||||
cmd = deviceTree {
|
||||
inherit pkgs;
|
||||
firmware = cfg.firmwarePackage;
|
||||
};
|
||||
args = lib.optionalString (!cfg.useGenerationDeviceTree) " -r";
|
||||
in "${cmd} ${args}";
|
||||
}}";
|
||||
|
||||
};
|
||||
|
||||
bootloader = ({ pkgs
|
||||
, nixosGenerationsDir
|
||||
, firmwareInstaller
|
||||
, nixosGenBuilder
|
||||
}: pkgs.replaceVarsWith {
|
||||
src = ./generational/nixos-generations-builder.sh;
|
||||
isExecutable = true;
|
||||
|
||||
replacements = {
|
||||
inherit (pkgs) bash;
|
||||
path = pkgs.lib.makeBinPath [
|
||||
pkgs.coreutils
|
||||
pkgs.gnused
|
||||
];
|
||||
|
||||
# NixOS-generations -independent
|
||||
installFirmwareBuilder = firmwareInstaller;
|
||||
# NixOS-generations -dependent
|
||||
inherit nixosGenerationsDir nixosGenBuilder;
|
||||
};
|
||||
});
|
||||
|
||||
# Builders used to write during system activation
|
||||
|
||||
ubootBuilder = import ./uboot-builder.nix {
|
||||
inherit pkgs;
|
||||
ubootPackage = (if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4);
|
||||
ubootPackage = (
|
||||
if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4
|
||||
);
|
||||
firmwareBuilder = firmwarePopulateCmd;
|
||||
extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd;
|
||||
};
|
||||
|
||||
uefiBuilder = import ./uefi-builder.nix{
|
||||
populateUbootBuilder = import ./uboot-builder.nix {
|
||||
pkgs = pkgs.buildPackages;
|
||||
ubootPackage = (
|
||||
if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4
|
||||
);
|
||||
firmwareBuilder = firmwarePopulateCmd;
|
||||
extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd;
|
||||
};
|
||||
|
||||
kernelbootBuilder = import ./kernelboot-builder.nix {
|
||||
inherit pkgs;
|
||||
uefiPackage = (if (cfg.variant == "5") then pkgs.${namespace}.uefi-rpi5 else pkgs.${namespace}.uefi-rpi4);
|
||||
firmwareBuilder = firmwarePopulateCmd;
|
||||
};
|
||||
|
||||
uefiBuilder = import ./uefi-builder.nix {
|
||||
inherit pkgs;
|
||||
uefiPackage = (
|
||||
if (cfg.variant == "5") then pkgs.${namespace}.uefi-rpi5 else pkgs.${namespace}.uefi-rpi4
|
||||
);
|
||||
firmwareBuilder = firmwarePopulateCmd;
|
||||
};
|
||||
|
||||
# Builders exposed via populateCmd, which run on the build architecture
|
||||
populateFirmwareBuilder = import ./firmware-builder.nix {
|
||||
populateFirmwareBuilder = import ./firmware-builder.nix {
|
||||
pkgs = pkgs.buildPackages;
|
||||
configTxt = pkgs.writeTextFile {
|
||||
name = "config.txt";
|
||||
@@ -97,12 +169,9 @@ let
|
||||
firmware = pkgs.${namespace}.raspberrypifw;
|
||||
};
|
||||
|
||||
populateUbootBuilder = import ./uboot-builder.nix {
|
||||
inherit ubootBinName;
|
||||
populateKernelbootBuilder = import ./kernelboot-builder.nix {
|
||||
pkgs = pkgs.buildPackages;
|
||||
ubootPackage = (if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4);
|
||||
firmwareBuilder = firmwarePopulateCmd;
|
||||
extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd;
|
||||
};
|
||||
|
||||
firmwarePopulateCmd = "${populateFirmwareBuilder} ${firmwareBuilderArgs}";
|
||||
@@ -114,8 +183,14 @@ let
|
||||
# system.build.installBootLoader
|
||||
uboot = "${ubootBuilder} -f /boot/firmware -b /boot -c";
|
||||
uefi = "${uefiBuilder} -f /boot/firmware -b /boot -c";
|
||||
kernel = builtins.concatStringsSep " " [
|
||||
"${mkBootloader pkgs}"
|
||||
"-g ${toString 10}"
|
||||
"-f /boot/firmware"
|
||||
"-c"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
# firmware: caller must provide `-c <nixos configuration>` and `-f <firmware target path>`
|
||||
# boot: caller must provide `-c <nixos configuration>` and `-b <boot-dir>`
|
||||
populateCmds = {
|
||||
@@ -123,6 +198,14 @@ let
|
||||
firmware = "${populateUbootBuilder}";
|
||||
boot = "${populateUbootBuilder}";
|
||||
};
|
||||
kernel = let cmd = builtins.concatStringsSep " " [
|
||||
"${mkBootloader pkgs.buildPackages}"
|
||||
"-g ${toString cfg.configurationLimit}"
|
||||
];
|
||||
in {
|
||||
firmware = "${cmd}";
|
||||
boot = "${cmd}";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
@@ -141,10 +224,11 @@ in
|
||||
type = lib.types.enum [
|
||||
"uefi"
|
||||
"uboot"
|
||||
"kernel"
|
||||
];
|
||||
default = "uefi";
|
||||
};
|
||||
|
||||
|
||||
apply-overlays-dtmerge = {
|
||||
enable = lib.mkEnableOption "" // {
|
||||
description = ''
|
||||
@@ -172,25 +256,33 @@ in
|
||||
initrd.availableKernelModules = [
|
||||
"usbhid"
|
||||
"usb-storage"
|
||||
] ++ (if (cfg.variant == "5") then [
|
||||
"nvme"
|
||||
] else
|
||||
[
|
||||
"vc4"
|
||||
"pcie-brcmstb" # required for the pcie bus to work
|
||||
"reset-raspberrypi" # required for vl805 firmware to load
|
||||
]);
|
||||
]
|
||||
++ (
|
||||
if (cfg.variant == "5") then
|
||||
[
|
||||
"nvme"
|
||||
]
|
||||
else
|
||||
[
|
||||
"vc4"
|
||||
"pcie-brcmstb" # required for the pcie bus to work
|
||||
"reset-raspberrypi" # required for vl805 firmware to load
|
||||
]
|
||||
);
|
||||
loader = {
|
||||
# kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
|
||||
generic-extlinux-compatible = {
|
||||
enable = lib.mkDefault (if cfg.bootType == "uefi" then false else true);
|
||||
useGenerationDeviceTree = lib.mkOverride 60 (if cfg.bootType == "uefi" then false else true);
|
||||
};
|
||||
systemd-boot.enable = (if cfg.bootType == "uefi" then true else false);
|
||||
systemd-boot.extraInstallCommands = let
|
||||
bootloaderInstaller = (if cfg.bootType == "uefi" then (builder."uefi") else (builder."uboot")); # todo
|
||||
in ''
|
||||
${bootloaderInstaller} -f /boot/firmware -b /boot -c
|
||||
'';
|
||||
systemd-boot.extraInstallCommands =
|
||||
let
|
||||
bootloaderInstaller = (builder."${cfg.bootType}");
|
||||
in
|
||||
''
|
||||
${bootloaderInstaller} -f /boot/firmware -b /boot -c
|
||||
'';
|
||||
grub.enable = lib.mkForce false;
|
||||
};
|
||||
};
|
||||
@@ -224,56 +316,85 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
${namespace}.hardware.raspberry-pi = {
|
||||
config = {
|
||||
all = {
|
||||
options = {
|
||||
os_prefix = lib.mkIf (cfg.bootType == "kernel") {
|
||||
enable = true;
|
||||
value = "${cfg.nixosGenerationsDir}/default/"; # "nixos/<generation-name>/"
|
||||
};
|
||||
kernel = lib.mkIf (cfg.bootType == "kernel" || cfg.bootType == "uboot") {
|
||||
enable = true;
|
||||
value = (if cfg.bootType == "uboot" then "u-boot.bin" else if cfg.bootType == "kernel" then "kernel.img" else "");
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
extra-config = let
|
||||
# https://www.raspberrypi.com/documentation/computers/config_txt.html#initramfs
|
||||
ramfsfile = "initrd";
|
||||
ramfsaddr = "followkernel"; # same as 0 = "after the kernel image"
|
||||
in ''
|
||||
[all]
|
||||
initramfs ${ramfsfile} ${ramfsaddr}
|
||||
'';
|
||||
};
|
||||
|
||||
# Common hardware settings
|
||||
hardware = {
|
||||
deviceTree = {
|
||||
filter = lib.mkDefault (if (cfg.variant == "5") then "bcm2712-rpi-*.dtb" else "bcm2711-rpi-*.dtb");
|
||||
overlays = (if (cfg.variant == "4") then [
|
||||
{
|
||||
name = "rpi4-cpu-revision";
|
||||
dtsText = ''
|
||||
/dts-v1/;
|
||||
/plugin/;
|
||||
overlays = (
|
||||
if (cfg.variant == "4") then
|
||||
[
|
||||
{
|
||||
name = "rpi4-cpu-revision";
|
||||
dtsText = ''
|
||||
/dts-v1/;
|
||||
/plugin/;
|
||||
|
||||
/ {
|
||||
compatible = "brcm,bcm2711";
|
||||
/ {
|
||||
compatible = "brcm,bcm2711";
|
||||
|
||||
fragment@0 {
|
||||
target-path = "/";
|
||||
__overlay__ {
|
||||
system {
|
||||
linux,revision = <0x00d03114>;
|
||||
fragment@0 {
|
||||
target-path = "/";
|
||||
__overlay__ {
|
||||
system {
|
||||
linux,revision = <0x00d03114>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
'';
|
||||
}
|
||||
# {
|
||||
# name = "enable-xhci";
|
||||
# dtsText = ''
|
||||
# /dts-v1/;
|
||||
# /plugin/;
|
||||
'';
|
||||
}
|
||||
# {
|
||||
# name = "enable-xhci";
|
||||
# dtsText = ''
|
||||
# /dts-v1/;
|
||||
# /plugin/;
|
||||
|
||||
# / {
|
||||
# compatible = "brcm,bcm2711";
|
||||
# fragment@0 {
|
||||
# //target-path = "/scb/xhci@7e9c0000";
|
||||
# target = <&xhci>;
|
||||
# __overlay__ {
|
||||
# status = "okay";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# '';
|
||||
# }
|
||||
] else
|
||||
[
|
||||
{
|
||||
name = "bcm2712d0-overlay";
|
||||
dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/bcm2712d0-overlay.dts";
|
||||
}
|
||||
]);
|
||||
# / {
|
||||
# compatible = "brcm,bcm2711";
|
||||
# fragment@0 {
|
||||
# //target-path = "/scb/xhci@7e9c0000";
|
||||
# target = <&xhci>;
|
||||
# __overlay__ {
|
||||
# status = "okay";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# '';
|
||||
# }
|
||||
]
|
||||
else
|
||||
[
|
||||
# {
|
||||
# name = "bcm2712d0-overlay";
|
||||
# dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/bcm2712d0-overlay.dts";
|
||||
# }
|
||||
]
|
||||
);
|
||||
};
|
||||
firmware = [ pkgs.${namespace}.raspberryPiWirelessFirmware ];
|
||||
graphics.enable32Bit = lib.mkForce false;
|
||||
@@ -281,7 +402,7 @@ in
|
||||
};
|
||||
|
||||
system = {
|
||||
#build.installBootLoader = lib.mkOverride 60 (if cfg.bootType == "uefi" then (builder."uefi") else (builder."uboot")); # todo
|
||||
#build.installBootLoader = lib.mkOverride 60 (if cfg.bootType == "uefi" then (builder."uefi") else (builder."uboot")); # todo
|
||||
#boot = {
|
||||
# loader = {
|
||||
# id = lib.mkOverride 60 (if cfg.bootType == "uefi" then "raspberrypi-uefi" else "raspberrypi-uboot"); # todo
|
||||
@@ -303,12 +424,12 @@ in
|
||||
users = {
|
||||
users.root.shell = pkgs.zsh;
|
||||
extraGroups = {
|
||||
gpio = {};
|
||||
i2c = {};
|
||||
input = {};
|
||||
plugdev = {};
|
||||
spi = {};
|
||||
video = {};
|
||||
gpio = { };
|
||||
i2c = { };
|
||||
input = { };
|
||||
plugdev = { };
|
||||
spi = { };
|
||||
video = { };
|
||||
};
|
||||
};
|
||||
|
||||
@@ -316,33 +437,44 @@ in
|
||||
udev.packages = [
|
||||
pkgs.${namespace}.udev-rules
|
||||
];
|
||||
xserver.extraConfig = let
|
||||
identifier = "rp1";
|
||||
driver = "rp1-vec|rp1-dsi|rp1-dpi";
|
||||
in ''
|
||||
Section "OutputClass"
|
||||
Identifier "${identifier}"
|
||||
MatchDriver "${driver}"
|
||||
Driver "modesetting"
|
||||
Option "PrimaryGPU" "true"
|
||||
EndSection
|
||||
'';
|
||||
xserver.extraConfig =
|
||||
let
|
||||
identifier = "rp1";
|
||||
driver = "rp1-vec|rp1-dsi|rp1-dpi";
|
||||
in
|
||||
''
|
||||
Section "OutputClass"
|
||||
Identifier "${identifier}"
|
||||
MatchDriver "${driver}"
|
||||
Driver "modesetting"
|
||||
Option "PrimaryGPU" "true"
|
||||
EndSection
|
||||
'';
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [ ] ++ (if cfg.variant == "5" then [
|
||||
(final: prev: {
|
||||
# https://github.com/nvmd/nixos-raspberrypi/issues/64
|
||||
# credit for the initial version of this snippet goes to @micahcc
|
||||
jemalloc = prev.jemalloc.overrideAttrs (old: {
|
||||
# --with-lg-page=(log2 page_size)
|
||||
# RPi5 (bcm2712): since our page size is 16384 (2**14), we need 14
|
||||
configureFlags = let
|
||||
pageSizeFlag = "--with-lg-page";
|
||||
in (prev.lib.filter (flag: prev.lib.hasPrefix pageSizeFlag flag == false) old.configureFlags)
|
||||
++ [ "${pageSizeFlag}=14" ];
|
||||
});
|
||||
})
|
||||
] else [ ])
|
||||
++ (if cfg.apply-overlays-dtmerge.enable then [ dt_ao_overlay ] else [ ]);
|
||||
nixpkgs.overlays =
|
||||
[ ]
|
||||
++ (
|
||||
if cfg.variant == "5" then
|
||||
[
|
||||
(_final: prev: {
|
||||
# https://github.com/nvmd/nixos-raspberrypi/issues/64
|
||||
# credit for the initial version of this snippet goes to @micahcc
|
||||
jemalloc = prev.jemalloc.overrideAttrs (old: {
|
||||
# --with-lg-page=(log2 page_size)
|
||||
# RPi5 (bcm2712): since our page size is 16384 (2**14), we need 14
|
||||
configureFlags =
|
||||
let
|
||||
pageSizeFlag = "--with-lg-page";
|
||||
in
|
||||
(prev.lib.filter (flag: prev.lib.hasPrefix pageSizeFlag flag == false) old.configureFlags)
|
||||
++ [ "${pageSizeFlag}=14" ];
|
||||
});
|
||||
})
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
)
|
||||
++ (if cfg.apply-overlays-dtmerge.enable then [ dt_ao_overlay ] else [ ]);
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user