From 8f0cd0fbde62ccd7e966c78280b545bb9f3998ad Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Wed, 4 Jul 2018 17:09:35 +0800 Subject: [PATCH] disk: rkparm: use env_update_filter() to append cmdline Change-Id: I4b5024adc4b2d176f1ffa25677323ba17a1d061f Signed-off-by: Joseph Chen --- disk/part_rkparm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/disk/part_rkparm.c b/disk/part_rkparm.c index 4dd2d564d7..8e2f37163f 100644 --- a/disk/part_rkparm.c +++ b/disk/part_rkparm.c @@ -48,14 +48,12 @@ static int rkparm_param_parse(char *param, struct list_head *parts_head, next = strchr(blkdev_parts, ':'); cmdline_end = strstr(cmdline, "\n"); /* end by '\n' */ *cmdline_end = '\0'; - /* skip "CMDLINE:" */ - env_update("bootargs", cmdline + strlen("CMDLINE:")); - /* - * Initrd fixup: remove unused "initrd=0x...,0x...", this for - * compatible with legacy parameter.txt + * 1. skip "CMDLINE:" + * 2. Initrd fixup: remove unused "initrd=0x...,0x...", this for + * compatible with legacy parameter.txt */ - env_delete("bootargs", "initrd="); + env_update_filter("bootargs", cmdline + strlen("CMDLINE:"), "initrd="); INIT_LIST_HEAD(parts_head); while (next) {