diff options
| author | Florian Klink <flokli@flokli.de> | 2021-06-25 23:30:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-25 23:30:07 +0200 |
| commit | b72bde7c4a1f9c9bf1a161f0c267186ce3c6483c (patch) | |
| tree | bc9ff15e096abb41b56a71bac3857dfe679a71c6 | |
| parent | audit: use hostPlatform.isStatic instead of targetPlatform.isStatic (diff) | |
| parent | nixos/sdcard: make firmware partition offset configurable (diff) | |
| download | nixpkgs-b72bde7c4a1f9c9bf1a161f0c267186ce3c6483c.tar.gz | |
Merge pull request #128142 from NixOS/backport-128082-to-release-21.05
[Backport release-21.05] nixos/sdcard: make firmware partition offset configurable
| -rw-r--r-- | nixos/modules/installer/sd-card/sd-image.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix index d0fe79903d34..2a10a77300e8 100644 --- a/nixos/modules/installer/sd-card/sd-image.nix +++ b/nixos/modules/installer/sd-card/sd-image.nix @@ -55,6 +55,22 @@ in ''; }; + firmwarePartitionOffset = mkOption { + type = types.int; + default = 8; + description = '' + Gap in front of the /boot/firmware partition, in mebibytes (1024×1024 + bytes). + Can be increased to make more space for boards requiring to dd u-boot + SPL before actual partitions. + + Unless you are building your own images pre-configured with an + installed U-Boot, you can instead opt to delete the existing `FIRMWARE` + partition, which is used **only** for the Raspberry Pi family of + hardware. + ''; + }; + firmwarePartitionID = mkOption { type = types.str; default = "0x2178694e"; @@ -177,7 +193,7 @@ in zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img # Gap in front of the first partition, in MiB - gap=8 + gap=${toString config.sdImage.firmwarePartitionOffset} # Create the image file sized to fit /boot/firmware and /, plus slack for the gap. rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }') |