diff --git a/modules/outputs/tftpboot.nix b/modules/outputs/tftpboot.nix index f8f03c26..84ae4b69 100644 --- a/modules/outputs/tftpboot.nix +++ b/modules/outputs/tftpboot.nix @@ -125,7 +125,6 @@ in { fdtput -p dtb /reserved-memory/$node no-map 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" dtbSize=$(binsize ./dtb ) diff --git a/modules/s6/default.nix b/modules/s6/default.nix index 8fbf3461..08d71524 100644 --- a/modules/s6/default.nix +++ b/modules/s6/default.nix @@ -5,8 +5,7 @@ let s6 s6-init-bin s6-linux-init - stdenvNoCC - writeShellScript; + stdenvNoCC; inherit (lib.lists) unique concatMap; inherit (lib) concatStrings; inherit (builtins) map; @@ -285,9 +284,6 @@ in { }; bin = dir { init = symlink "${s6-init-bin}/bin/init"; - #init = symlink (writeShellScript "myinit.sh" '' - # echo 'tralala' - #''); }; }; }; diff --git a/pkgs/kernel/kernel_fdt.its b/pkgs/kernel/kernel_fdt.its index 6127d80e..c9907cf0 100644 --- a/pkgs/kernel/kernel_fdt.its +++ b/pkgs/kernel/kernel_fdt.its @@ -40,8 +40,8 @@ }; configurations { - default = "config-1"; - config-1 { + default = "conf-1"; + conf-1 { description = "Boot Linux kernel with FDT blob"; kernel = "kernel"; fdt = "fdt-1";