dan/liminix
1
0
Fork 5
Code

Remove experimental leftovers

Browse Source
This commit is contained in:
Arnout Engelen 2024-12-30 22:07:30 +01:00
parent d1f9b039f2
commit 16a1c5101d
No known key found for this signature in database
GPG Key ID: 061107B0F74A6DAA
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/outputs/tftpboot.nix
View File

@ -124,7 +124,6 @@ in {
fdtput -p -t lx dtb /reserved-memory/$node reg $ac_prefix $(hex $rootfsStart) $sz_prefix $(hex $rootfsSize) fdtput -p -t lx dtb /reserved-memory/$node reg $ac_prefix $(hex $rootfsStart) $sz_prefix $(hex $rootfsSize)
cmd="liminix ${cmdline} mtdparts=phram0:''${rootfsSize}(rootfs) phram.phram=phram0,''${rootfsStart},''${rootfsSize},${toString config.hardware.flash.eraseBlockSize} root=/dev/mtdblock0"; cmd="liminix ${cmdline} mtdparts=phram0:''${rootfsSize}(rootfs) phram.phram=phram0,''${rootfsStart},''${rootfsSize},${toString config.hardware.flash.eraseBlockSize} root=/dev/mtdblock0";
#cmd="liminix ${cmdline}"
fdtput -t s dtb /chosen ${config.boot.commandLineDtbNode} "$cmd" fdtput -t s dtb /chosen ${config.boot.commandLineDtbNode} "$cmd"
dtbSize=$(binsize ./dtb ) dtbSize=$(binsize ./dtb )

6
modules/s6/default.nix
View File

@ -5,8 +5,7 @@ let
s6 s6
s6-init-bin s6-init-bin
s6-linux-init s6-linux-init
stdenvNoCC stdenvNoCC;
writeShellScript;
inherit (lib.lists) unique concatMap; inherit (lib.lists) unique concatMap;
inherit (lib) concatStrings; inherit (lib) concatStrings;
inherit (builtins) map; inherit (builtins) map;
@ -293,9 +292,6 @@ in {
}; };
bin = dir { bin = dir {
init = symlink "${s6-init-bin}/bin/init"; init = symlink "${s6-init-bin}/bin/init";
#init = symlink (writeShellScript "myinit.sh" ''
# echo 'tralala'
#'');
}; };
}; };
}; };

4
pkgs/kernel/kernel_fdt.its
View File

@ -40,8 +40,8 @@
}; };
configurations { configurations {
default = "config-1"; default = "conf-1";
config-1 { conf-1 {
description = "Boot Linux kernel with FDT blob"; description = "Boot Linux kernel with FDT blob";
kernel = "kernel"; kernel = "kernel";
fdt = "fdt-1"; fdt = "fdt-1";