nixos/uboot-builder: allow setting specific dtb #169297
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
c0deaddict
force-pushed
the
raspberrypi-uboot-specific-dtb
branch
from
07bf762
to
84157d7
Compare
klemensn
reviewed
Jun 19, 2022
|
|
||
| builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; }; | ||
| builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; }; | ||
|
|
||
| builder = | ||
| if cfg.uboot.enable then | ||
| "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c" | ||
| "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr}" | ||
| + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}" |
There was a problem hiding this comment.
dtCfg.name is now an arbitrary user-provided string, so best use lib.strings.escapeShellArg.
Better yet, always sanitze:
builder = escapeShellArgs (
if cfg.uboot.enable then [
builderUboot
"-g" "${toString cfg.uboot.configurationLimit}"
"-t" timeoutStr
] ++ lib.optionals (dtCfg.name != null) [
"-c" dtCfg.name
] else [
builderGeneric
"-c"
]
);
|
|
||
| builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; }; | ||
| builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; }; | ||
|
|
||
| builder = | ||
| if cfg.uboot.enable then | ||
| "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c" | ||
| "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr}" |
There was a problem hiding this comment.
Why not just append the optional -n name after -c and thus diff churn?
stale
bot
added
the
2.status: stale
|
I'm closing this since the You should migrate to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Uboot on Raspberry Pi's is loading the wrong DTB file for some unknown reason. For example on a Pi 3B it's loading bcm2837 instead of bcm2710. This has been corrected with the following fixup on the
linux-rpikernel:nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix
Line 58 in b235fa2
However, this fixup doesn't work anymore if custom
hardware.deviceTree.overlaysare used, since the overlays are compiled from source (?). I've looked for a proper workaround and came up with this patch. This patch allows specifying a specific DTB that needs to be loaded, instead of Uboot choosing one. Theboot.loader.generic-extlinux-compatiblealready supports this option but this isn't passed by the raspberrypi uboot builder.For the Pi 3B i've used this setting to fixate the correct DTB:
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes