[PATCH v4 3/6] bootm: Append bootargs value when bootmeth_android provide cmdline

[Mattijs Korpershoek]

Hi George,

Thank you for the patch.

On Mon, Jun 30, 2025 at 15:56, George Chan via B4 Relay <devnull+gchan9527.gmail.com at kernel.org> wrote:

> From: George Chan <gchan9527 at gmail.com>
>
> Old logic wipe bootargs env with cmdline, new logic cater the value
> by prepending cmdline value to bootargs.
>
> Signed-off-by: George Chan <gchan9527 at gmail.com>
> ---
>  boot/bootm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/boot/bootm.c b/boot/bootm.c
> index 4bdca22ea8c..d8e0c3527d0 100644
> --- a/boot/bootm.c
> +++ b/boot/bootm.c
> @@ -1165,7 +1165,7 @@ int bootm_boot_start(ulong addr, const char *cmdline)
>  
>  	snprintf(addr_str, sizeof(addr_str), "%lx", addr);
>  
> -	ret = env_set("bootargs", cmdline);
> +	ret = android_image_modify_bootargs_env(cmdline, NULL);

I don't think it can be done this way. bootm_boot_start() is used in the
ChromeOS bootmethod as well (boot/bootmeth_cros.c)

Changing this would potentially break ChromeOS boot behaviour so I'd
prefer to find another solution.

I know that TI has a downstream patch that changes bootmeth_android.c
instead:

https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04-next&id=9d802d798ac143e06ffe545606aa657a6c32cc63

Would that work for you?


>  	if (ret) {
>  		printf("Failed to set cmdline\n");
>  		return ret;
>
> -- 
> 2.43.0