commit d8a2bb86c0e52bd5c41b2404ed3bbc7f80768842 · pyrox.dev/nixpkgs

+12 -5

nixos/modules/system/boot/loader/raspberrypi/builder.sh

···

       60
       60
        
           fi

     

       61
       61
        
       

     

       62
       62
        
           local kernel=$(readlink -f $path/kernel)

     

       63
       63
       -
           # local initrd=$(readlink -f $path/initrd)

     

       63
       63
       +
           local initrd=$(readlink -f $path/initrd)

     

       64
       64
        
       

     

       65
       65
        
           if test -n "@copyKernels@"; then

     

       66
       66
        
               copyToKernelsDir $kernel; kernel=$result

     

       67
       67
       -
               # copyToKernelsDir $initrd; initrd=$result

     

       67
       67
       +
               copyToKernelsDir $initrd; initrd=$result

     

       68
       68
        
           fi

     

       69
       69
        
           

     

       70
       70
        
           echo $(readlink -f $path) > $outdir/$generation-system

     

       71
       71
        
           echo $(readlink -f $path/init) > $outdir/$generation-init

     

       72
       72
        
           cp $path/kernel-params $outdir/$generation-cmdline.txt

     

       73
       73
       -
           # echo $initrd > $outdir/$generation-initrd

     

       73
       73
       +
           echo $initrd > $outdir/$generation-initrd

     

       74
       74
        
           echo $kernel > $outdir/$generation-kernel

     

       75
       75
        
       

     

       76
       76
        
           if test $(readlink -f "$path") = "$default"; then

     

       77
       77
       -
             copyForced $kernel /boot/kernel.img

     

       78
       78
       -
             # copyForced $initrd /boot/initrd

     

       77
       77
       +
             if [ @version@ -eq 1 ]; then

     

       78
       78
       +
               copyForced $kernel /boot/kernel.img

     

       79
       79
       +
             else

     

       80
       80
       +
               copyForced $kernel /boot/kernel7.img

     

       81
       81
       +
             fi

     

       82
       82
       +
             copyForced $initrd /boot/initrd

     

       79
       83
        
             cp "$(readlink -f "$path/init")" /boot/nixos-init

     

       80
       84
        
             echo "`cat $path/kernel-params` init=$path/init" >/boot/cmdline.txt

     

       81
       85
        
       

     
···

       98
       102
        
       copyForced $fwdir/bootcode.bin  /boot/bootcode.bin

     

       99
       103
        
       copyForced $fwdir/fixup.dat     /boot/fixup.dat

     

       100
       104
        
       copyForced $fwdir/fixup_cd.dat  /boot/fixup_cd.dat

     

       105
       105
       +
       copyForced $fwdir/fixup_db.dat  /boot/fixup_db.dat

     

       101
       106
        
       copyForced $fwdir/start.elf     /boot/start.elf

     

       102
       107
        
       copyForced $fwdir/start_cd.elf  /boot/start_cd.elf

     

       108
       108
       +
       copyForced $fwdir/start_db.elf  /boot/start_db.elf

     

       109
       109
       +
       copyForced $fwdir/start_x.elf   /boot/start_x.elf

     

       103
       110
        
       

     

       104
       111
        
       # Remove obsolete files from /boot/old.

     

       105
       112
        
       for fn in /boot/old/*linux* /boot/old/*initrd*; do

+14

nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       +
         cfg = config.boot.loader.raspberryPi;

     

       6
       7
        
       

     

       7
       8
        
         builder = pkgs.substituteAll {

     

       8
       9
        
           src = ./builder.sh;

     
···

       10
       11
        
           inherit (pkgs) bash;

     

       11
       12
        
           path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];

     

       12
       13
        
           firmware = pkgs.raspberrypifw;

     

       14
       14
       +
           version = cfg.version;

     

       13
       15
        
         };

     

       14
       16
        
       

     

       15
       17
        
         platform = pkgs.stdenv.platform;

     
···

       29
       31
        
             '';

     

       30
       32
        
           };

     

       31
       33
        
       

     

       34
       34
       +
           boot.loader.raspberryPi.version = mkOption {

     

       35
       35
       +
             default = 2;

     

       36
       36
       +
             type = types.int;

     

       37
       37
       +
             description = ''

     

       38
       38
       +
             '';

     

       39
       39
       +
           };

     

       40
       40
       +
       

     

       32
       41
        
         };

     

       33
       42
        
       

     

       34
       43
        
         config = mkIf config.boot.loader.raspberryPi.enable {

     

       35
       44
        
           system.build.installBootLoader = builder;

     

       36
       45
        
           system.boot.loader.id = "raspberrypi";

     

       37
       46
        
           system.boot.loader.kernelFile = platform.kernelTarget;

     

       47
       47
       +
           assertions = [

     

       48
       48
       +
             { assertion = (cfg.version == 1 || cfg.version == 2);

     

       49
       49
       +
               message = "loader.raspberryPi.version should be 1 or 2";

     

       50
       50
       +
             }

     

       51
       51
       +
           ];

     

       38
       52
        
         };

     

       39
       53
        
       }

+2 -2

pkgs/os-specific/linux/firmware/raspberrypi/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
       

     

       5
       5
       -
         rev = "3ab17ac25e";

     

       5
       5
       +
         rev = "b7bbd3d1683e9f3bb11ef86b952adee71e83862f";

     

       6
       6
        
       

     

       7
       7
        
       in stdenv.mkDerivation {

     

       8
       8
        
         name = "raspberrypi-firmware-${rev}";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://github.com/raspberrypi/firmware/archive/${rev}.tar.gz";

     

       12
       12
       -
           sha256 = "080va4zz858bwwgxam8zy58gpwjpxfg7v5h1q5b4cpbzjihsxcx9";

     

       12
       12
       +
           sha256 = "16wpwa1y3imd3la477b3rfbfypssvlh0zjdag3hgkm33aysizijp";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         installPhase = ''