Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1374283pxf; Fri, 26 Mar 2021 06:48:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+f/LudW896Kmype0DetkuLK6gHiORK55icf3TuC8vt+duflGK73wOBVHVbgQsijqFoJOF X-Received: by 2002:a17:906:8308:: with SMTP id j8mr15020404ejx.339.1616766521778; Fri, 26 Mar 2021 06:48:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616766521; cv=none; d=google.com; s=arc-20160816; b=oNu9QSGaENTodQnLFLho7ijvD/MDSoUtbj9iwc7CpclnZU6Eur/mtbv2eGxtLN5TnW cEANvQh6EpitFmiuIe3w0AeNtOBAI80Mbz6PaWPQqBGSWlSe6Eqe3lzTdXbx5PlDmS+g PI7t1vrpLVsB7C9snnwGuhFxKkrKhFYhwV0KgvDs7Lwf6pTnEkYh0jNYvhGLpofpbOxF vXLVC6qhAADMw544npJmhzOOAHgqs+Noy2IDBDyueHKCdCUHllj65uqu9++9xVIdD+ND BHWdMLtU/41MoA9sbQrjFtIkj2i2Lo0SkzibCZ2p1h3iXtZBsQtReIf0N8yNHqO64TI2 FqGQ== 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=V+GLcMyjESdwSfPrwPbmqI4Oop65bQ0+q5NTt/T0npc=; b=j6CX/yzVieTCfysdjWAA1DgDB9E1tyi2XkIGqfzjD4ChKza06opMfR6Gw0w0XrHFPq 2RGrNab2wlcw1IVSSPEgHx/+cwTNphs5xipNdjvZh3aAIWeGiLQktRQUKCPztcNStCdB 4ECxylla+QOovccGlVpoLGUvU1LEdhhAyHm0N79dJ5K4gmSAw3nK/MTi+WvoSmhfMlxd OMdTsxAVrTuhsaOMDQh3FTAoMxJnngoJCeqWGRWAkFRL212Urst5fZNSp4VG/7RzSob8 7Dz61hRR2xsujB4fLtz18Q/qTgD2eP2u+U4xxJR1F9VhUXo4J5e5cB8P+IPjkhGo7I/6 NrSA== 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 s28si6963837edw.110.2021.03.26.06.48.18; Fri, 26 Mar 2021 06:48:41 -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 S230272AbhCZNrm (ORCPT + 99 others); Fri, 26 Mar 2021 09:47:42 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:54132 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230108AbhCZNpa (ORCPT ); Fri, 26 Mar 2021 09:45:30 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4F6NWg6LQyz9v03Q; Fri, 26 Mar 2021 14:45:03 +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 zJCa16S0wtXm; Fri, 26 Mar 2021 14:45:03 +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 4F6NWb59d2z9v03M; Fri, 26 Mar 2021 14:44:59 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 8FD6D8B8C7; Fri, 26 Mar 2021 14:45:00 +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 hUWtC_m1pLjs; Fri, 26 Mar 2021 14:45:00 +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 485328B8CB; Fri, 26 Mar 2021 14:45:00 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id C232D67611; Fri, 26 Mar 2021 13:45:00 +0000 (UTC) Message-Id: <3a5407b76a256affa124902d9c2285a98d2516dc.1616765870.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v3 13/17] sparc: 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:45:00 +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/sparc/Kconfig | 18 +----------------- arch/sparc/prom/bootstr_64.c | 2 +- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 164a5254c91c..2a197f3a2549 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -50,6 +50,7 @@ config SPARC select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH select SET_FS + select GENERIC_CMDLINE if SPARC64 config SPARC32 def_bool !64BIT @@ -313,23 +314,6 @@ config SCHED_MC making when dealing with multi-core CPU chips at a cost of slightly increased overhead in some places. If unsure say N here. -config CMDLINE_BOOL - bool "Default bootloader kernel arguments" - depends on SPARC64 - -config CMDLINE - string "Initial kernel command string" - depends on CMDLINE_BOOL - default "console=ttyS0,9600 root=/dev/sda1" - help - Say Y here if you want to be able to pass default arguments to - the kernel. This will be overridden by the bootloader, if you - use one (such as SILO). This is most useful if you want to boot - a kernel from TFTP, and want default options to be available - with having them passed on the command line. - - NOTE: This option WILL override the PROM bootargs setting! - config SUN_PM bool default y if SPARC32 diff --git a/arch/sparc/prom/bootstr_64.c b/arch/sparc/prom/bootstr_64.c index f1cc34d99eec..4853a45b3de9 100644 --- a/arch/sparc/prom/bootstr_64.c +++ b/arch/sparc/prom/bootstr_64.c @@ -25,7 +25,7 @@ struct { char bootstr_buf[BARG_LEN]; } bootstr_info = { .bootstr_len = BARG_LEN, -#ifdef CONFIG_CMDLINE +#if CONFIG_CMDLINE != "" .bootstr_valid = 1, .bootstr_buf = CONFIG_CMDLINE, #endif -- 2.25.0