Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1373922pxf; Fri, 26 Mar 2021 06:48:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVRfmL8CAUKbpj6SJqkr16ObNs1A+fHUWkj1tMqOS4ebngy2q+zItJnnpxNuEewli8Klaq X-Received: by 2002:a17:907:2d24:: with SMTP id gs36mr15512505ejc.344.1616766496558; Fri, 26 Mar 2021 06:48:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616766496; cv=none; d=google.com; s=arc-20160816; b=muIUw6eiK5hIUC+Lyg50NkjMNkzs7XVPHCuzbp6rOVZtKlulvePTHund/GQnGR7/4y aDQKzIyTSkQvOKKSrEFg8VPpsEBwlGRUihezst4U1h9hM1dChRPnjsKxRAjde4XRW0KZ U+V8uJgmMXGFOqPl6V/ArbaBdnzqM/c4YePTleriyWEPFf3CUxbTkcJ9F/AQoJ1CjQdM yOqXjX6//FuJg6A2H01+f/mZv7d1n6h12VbKnlFObVDlDQ67fs+oZd0FoHOuRVuLMHg5 y9s9LDtAT3VR7jcS/DVu+GDg5urKo/RSndaE52u+9ZxkoqU2EdMy26zSwgq9DE0ZcH8j TXWw== 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=AeQrUycua2/PdRU2HTowHs52x8ZvSf509B6yNT1TCIs=; b=IcXYY6sBZSFZw8IwXuN6PmNZWFJ26v21gALJcY+JturygfOPDajLUnMkpNRlaJw3kR a0uXjK6M9mua+HasJKoNLoOQW4gZkP+TPfJidHKEhCouNUQLlMdZ7SU9+UtMhJH2Wful hCL61Woj2A3lQg3ZD7DMSMcHzAwyBdznf+mQ1/6djc48SBuWUS7rWVCh1WA36p5Zy7f2 BJCtOVvhplOwQ2xdad/WJKDNAOUhdxgognMCQ5or93pGHmERb78nzxKf45ViLonLFWk4 IhjUHvlKLgrco7/U8kd1McfNW0ICFgKEfAGzGwjNH2XR1FDK7BVifIQj5A6Ms8K3CWsa 2hyA== 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 k9si2132003eje.366.2021.03.26.06.47.53; Fri, 26 Mar 2021 06:48:16 -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 S230187AbhCZNqz (ORCPT + 99 others); Fri, 26 Mar 2021 09:46:55 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:28081 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230016AbhCZNpZ (ORCPT ); Fri, 26 Mar 2021 09:45:25 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4F6NWR6RK3z9v03F; Fri, 26 Mar 2021 14:44:51 +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 e4Ftj0Jvyaj1; Fri, 26 Mar 2021 14:44:51 +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 4F6NWR4zwtz9v03B; Fri, 26 Mar 2021 14:44:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6D8748B8CD; Fri, 26 Mar 2021 14:44:52 +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 NpujWXqfQku1; Fri, 26 Mar 2021 14:44:52 +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 E574D8B8C9; Fri, 26 Mar 2021 14:44:51 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 71E7E67611; Fri, 26 Mar 2021 13:44:52 +0000 (UTC) Message-Id: <7362e4f6a5f5b79e6ad3fd3cec3183a4a283f7fc.1616765870.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v3 05/17] arm: Convert to GENERIC_CMDLINE 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:52 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This converts the architecture to GENERIC_CMDLINE. Signed-off-by: Christophe Leroy --- arch/arm/Kconfig | 38 +---------------------------------- arch/arm/kernel/atags_parse.c | 15 +++++--------- 2 files changed, 6 insertions(+), 47 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5da96f5df48f..67bc75f2da81 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -50,6 +50,7 @@ config ARM select GENERIC_ARCH_TOPOLOGY if ARM_CPU_TOPOLOGY select GENERIC_ATOMIC64 if CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI select GENERIC_CLOCKEVENTS_BROADCAST if SMP + select GENERIC_CMDLINE if ATAGS select GENERIC_IRQ_IPI if SMP select GENERIC_CPU_AUTOPROBE select GENERIC_EARLY_IOREMAP @@ -1740,43 +1741,6 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND endchoice -config CMDLINE - string "Default kernel command string" - default "" - help - On some architectures (e.g. CATS), there is currently no way - for the boot loader to pass arguments to the kernel. For these - architectures, you should supply some command-line options at build - time by entering them here. As a minimum, you should specify the - memory size and the root device (e.g., mem=64M root=/dev/nfs). - -choice - prompt "Kernel command line type" if CMDLINE != "" - default CMDLINE_FROM_BOOTLOADER - depends on ATAGS - -config CMDLINE_FROM_BOOTLOADER - bool "Use bootloader kernel arguments if available" - help - Uses the command-line options passed by the boot loader. If - the boot loader doesn't provide any, the default kernel command - string provided in CMDLINE will be used. - -config CMDLINE_EXTEND - bool "Extend bootloader kernel arguments" - help - The command-line arguments provided by the boot loader will be - appended to the default kernel command string. - -config CMDLINE_FORCE - bool "Always use the default kernel command string" - help - Always use the default kernel command string, even if the boot - loader passes other arguments to the kernel. - This is useful if you cannot or don't want to change the - command-line options your boot loader passes to the kernel. -endchoice - config XIP_KERNEL bool "Kernel Execute-In-Place from ROM" depends on !ARM_LPAE && !ARCH_MULTIPLATFORM diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c index 373b61f9a4f0..3d5bd52ee458 100644 --- a/arch/arm/kernel/atags_parse.c +++ b/arch/arm/kernel/atags_parse.c @@ -14,6 +14,7 @@ * is not parsed in any way). */ +#include #include #include #include @@ -120,16 +121,10 @@ __tagtable(ATAG_REVISION, parse_tag_revision); static int __init parse_tag_cmdline(const struct tag *tag) { -#if defined(CONFIG_CMDLINE_EXTEND) - strlcat(default_command_line, " ", COMMAND_LINE_SIZE); - strlcat(default_command_line, tag->u.cmdline.cmdline, - COMMAND_LINE_SIZE); -#elif defined(CONFIG_CMDLINE_FORCE) - pr_warn("Ignoring tag cmdline (using the default kernel command line)\n"); -#else - strlcpy(default_command_line, tag->u.cmdline.cmdline, - COMMAND_LINE_SIZE); -#endif + cmdline_build(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE); + + if IS_ENABLED(CONFIG_CMDLINE_FORCE) + pr_warn("Ignoring tag cmdline (using the default kernel command line)\n"); return 0; } -- 2.25.0