Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1372893pxf; Fri, 26 Mar 2021 06:47:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOa4yzptY7fS/3mzzd+8qCspKJ5C4F6YmFKox+zW5mQCoaaADdWMZu4/VQI4xP4nf6D1fm X-Received: by 2002:a17:906:8408:: with SMTP id n8mr14884573ejx.152.1616766427222; Fri, 26 Mar 2021 06:47:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616766427; cv=none; d=google.com; s=arc-20160816; b=u61vfwoXp+sWiLa14jcRJh+04XrO34/RColOo3Hbyj6Pt2NOyjQ66RcY+J1OzdXgbh JJyHv4+gLnxwOtlfhR1ebL40SnRoTkqwIFVGi+AooLAtfx9mjGBA7ZPSzPZssMEimer3 lqLx+toiYs3dd2hTuBMZH4a4n3vCkm66WkvE+M+JdArEJ/qTr/7/YccuRjCOlmOlHQpu diGJzwyi7JbgZfqzEeu/VkjRvNE/7qJ/yTQ8JYol1A5cpI2K8gP6E9g20Uq5OwqSpcZz ncRpcg/QY/1IYmipbQhMbdSmu0g3pH3ASnzOMxhbqfuLCK56CPp2Hy/FcsYN/1dv20DX pjjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:references:in-reply-to :message-id; bh=NdfKnBADhe8cwaiytRRZON2+8ZYmPN/ILxr40QMdl8U=; b=Bng5/eZ76H04Uphk4/q7fneYm4zkV71t4NXyI9Yy7YrVdUNRuUDCqAouy9z5ddqGkb B4syY/xLgRWmkRXd9/DbPJmagQNqBWsIKv57pWdeBz/RKhvXWnwbp18XzwM9u3Zq4Dt9 W7+AAhrtXGEapz0yufhHCxV7IFkrYrFW8Wlr8u5bChTsZV0E/6gTckXgp+ZuRgFba1Es QNRiu6cUgD/84fyX5z1t0SfvtLtTuq7GZH4BF6joDIkMixZs9jUWrce22UvmQn1PRcHP +O0rLkE/D/uYfvyRwju8el63tNvLKCECBH65oVa/m88pZZMsRxDxFHR99TvRUSjGesF8 hD/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jg25si6714589ejc.50.2021.03.26.06.46.42; Fri, 26 Mar 2021 06:47:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230210AbhCZNpy (ORCPT + 99 others); Fri, 26 Mar 2021 09:45:54 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:10388 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230159AbhCZNoz (ORCPT ); Fri, 26 Mar 2021 09:44:55 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4F6NWN2bwmz9tyyY; Fri, 26 Mar 2021 14:44:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id WXR477eJDIpw; Fri, 26 Mar 2021 14:44:48 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4F6NWN1k0Gz9tyyV; Fri, 26 Mar 2021 14:44:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 196218B8C9; Fri, 26 Mar 2021 14:44:49 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id um4ZFYXC0Irt; Fri, 26 Mar 2021 14:44:49 +0100 (CET) Received: from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id CD9DC8B8C7; Fri, 26 Mar 2021 14:44:48 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 5A96B67611; Fri, 26 Mar 2021 13:44:49 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v3 02/17] drivers: of: use cmdline building function To: will@kernel.org, danielwa@cisco.com, robh@kernel.org, daniel@gimpelevich.san-francisco.ca.us Cc: linux-arch@vger.kernel.org, devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, microblaze , linux-mips@vger.kernel.org, nios2 , openrisc@lists.librecores.org, linux-hexagon@vger.kernel.org, linux-riscv@lists.infradead.org, x86@kernel.org, linux-xtensa@linux-xtensa.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org Date: Fri, 26 Mar 2021 13:44:49 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch uses the new cmdline building function to concatenate the of provided cmdline with built-in parts based on compile-time options. Signed-off-by: Christophe Leroy --- drivers/of/fdt.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index dcc1dd96911a..cf2b95b8f298 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -25,6 +25,7 @@ #include #include #include +#include #include /* for COMMAND_LINE_SIZE */ #include @@ -1050,26 +1051,10 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, /* Retrieve command line */ p = of_get_flat_dt_prop(node, "bootargs", &l); - if (p != NULL && l > 0) - strlcpy(data, p, min(l, COMMAND_LINE_SIZE)); + if (l <= 0) + p = NULL; - /* - * CONFIG_CMDLINE is meant to be a default in case nothing else - * managed to set the command line, unless CONFIG_CMDLINE_FORCE - * is set in which case we override whatever was found earlier. - */ -#ifdef CONFIG_CMDLINE -#if defined(CONFIG_CMDLINE_EXTEND) - strlcat(data, " ", COMMAND_LINE_SIZE); - strlcat(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE); -#elif defined(CONFIG_CMDLINE_FORCE) - strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE); -#else - /* No arguments from boot loader, use kernel's cmdl*/ - if (!((char *)data)[0]) - strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE); -#endif -#endif /* CONFIG_CMDLINE */ + cmdline_build(data, p, COMMAND_LINE_SIZE); pr_debug("Command line is: %s\n", (char *)data); -- 2.25.0