From 01e43896df8e326ada92d832653457ea453933c1 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 18 Oct 2023 16:22:39 +0200 Subject: [PATCH] common/uboot: Explicitly separate kernel/user arguments This way, we avoid arguments intended for userspace to be accidentally parsed by the kernel. --- board/aarch64/rootfs/boot/syslinux/syslinux.conf | 2 +- board/common/uboot/scripts/ixbootslot.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/aarch64/rootfs/boot/syslinux/syslinux.conf b/board/aarch64/rootfs/boot/syslinux/syslinux.conf index fbc87ac0..f6aafd54 100644 --- a/board/aarch64/rootfs/boot/syslinux/syslinux.conf +++ b/board/aarch64/rootfs/boot/syslinux/syslinux.conf @@ -1,4 +1,4 @@ label Infix (aarch64) kernel /boot/Image fdtdir /boot - append ${bootargs_root} ${bootargs_rauc} ${bootargs_log} + append ${bootargs_root} ${bootargs_log} -- ${bootargs_user} diff --git a/board/common/uboot/scripts/ixbootslot.sh b/board/common/uboot/scripts/ixbootslot.sh index 5fa61502..dd26ff78 100644 --- a/board/common/uboot/scripts/ixbootslot.sh +++ b/board/common/uboot/scripts/ixbootslot.sh @@ -14,7 +14,7 @@ if test "${prepared}" = "ok"; then if iminfo ${ramdisk_addr_r}; then echo "${slot}: Booting..." - setenv bootargs_rauc "rauc.slot=${slot}" + setenv bootargs_user "rauc.slot=${slot}" blkmap create boot blkmap get boot dev blkmapnum