From 436eb03a7b37363d432205771e055debd820c460 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 16 Mar 2024 20:06:38 +0200 Subject: [PATCH] tftpboot: use commandLineDtbNode config.boot.commandLineDtbNode can be set from `bootargs` to `bootargs-override` (used for boards where the u-boot on the board does set `bootargs` on its own). In that case, the code updating the cmdline for tftpboot purposes also needs to update this node, not the `bootargs` node. Otherwise the kernel won't find the phram device, as it never heard about it, as it didn't get the necessary cmdline options. --- modules/outputs/tftpboot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/outputs/tftpboot.nix b/modules/outputs/tftpboot.nix index a947bc0..f8f0572 100644 --- a/modules/outputs/tftpboot.nix +++ b/modules/outputs/tftpboot.nix @@ -122,7 +122,7 @@ in { 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"; - fdtput -t s dtb /chosen bootargs "$cmd" + fdtput -t s dtb /chosen ${config.boot.commandLineDtbNode} "$cmd" dtbSize=$(binsize ./dtb )