Skip to content

Commit

Permalink
Remove dead code from device-pkgs.nix
Browse files Browse the repository at this point in the history
  • Loading branch information
danielfullmer committed Oct 8, 2023
1 parent c9e135c commit fca2d0c
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions device-pkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let
else throw "Unknown SoC type";

inherit (cfg.flashScriptOverrides)
flashArgs fuseArgs partitionTemplate additionalDtbOverlays;
flashArgs fuseArgs partitionTemplate;

tosArgs = {
inherit socType;
Expand Down Expand Up @@ -101,9 +101,7 @@ let
fi
'';
initrd = makeInitrd {
contents = let
kernel = config.boot.kernelPackages.kernel;
in [
contents = [
{ object = jetpack-init; symlink = "/init"; }
{ object = "${modulesClosure}/lib/modules"; symlink = "/lib/modules"; }
{ object = "${modulesClosure}/lib/firmware"; symlink = "/lib/firmware"; }
Expand Down Expand Up @@ -162,8 +160,7 @@ let
bup = runCommand "bup-${hostName}-${l4tVersion}" {
inherit (cfg.firmware.secureBoot) requiredSystemFeatures;
} ((mkFlashScript {
flashCommands = let
in lib.concatMapStringsSep "\n" (v: with v;
flashCommands = lib.concatMapStringsSep "\n" (v: with v;
"BOARDID=${boardid} BOARDSKU=${boardsku} FAB=${fab} BOARDREV=${boardrev} FUSELEVEL=${fuselevel} CHIPREV=${chiprev} ./flash.sh ${lib.optionalString (partitionTemplate != null) "-c flash.xml"} --no-flash --bup --multi-spec ${builtins.toString flashArgs}"
) cfg.firmware.variants;
}) + ''
Expand Down

0 comments on commit fca2d0c

Please sign in to comment.