Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1458814/?format=api
{ "id": 1458814, "url": "http://patchwork.ozlabs.org/api/patches/1458814/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/da2e403c3eab066a5b0f85d283fc1f3ba96ac749.1616765870.git.christophe.leroy@csgroup.eu/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<da2e403c3eab066a5b0f85d283fc1f3ba96ac749.1616765870.git.christophe.leroy@csgroup.eu>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/da2e403c3eab066a5b0f85d283fc1f3ba96ac749.1616765870.git.christophe.leroy@csgroup.eu/", "date": "2021-03-26T13:45:04", "name": "[v3,16/17] mips: Convert to GENERIC_CMDLINE", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "c07497d3ff21db2874751a0e994b9941ce81af3a", "submitter": { "id": 79086, "url": "http://patchwork.ozlabs.org/api/people/79086/?format=api", "name": "Christophe Leroy", "email": "christophe.leroy@csgroup.eu" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/da2e403c3eab066a5b0f85d283fc1f3ba96ac749.1616765870.git.christophe.leroy@csgroup.eu/mbox/", "series": [ { "id": 236020, "url": "http://patchwork.ozlabs.org/api/series/236020/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=236020", "date": "2021-03-26T13:44:49", "name": "Implement GENERIC_CMDLINE", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/236020/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1458814/comments/", "check": "success", "checks": "http://patchwork.ozlabs.org/api/patches/1458814/checks/", "tags": {}, "related": [ { "id": 1461773, "url": "http://patchwork.ozlabs.org/api/patches/1461773/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/a01b6cdbae01fff77e26f7a5c40ee5260e1952b5.1617375802.git.christophe.leroy@csgroup.eu/", "msgid": "<a01b6cdbae01fff77e26f7a5c40ee5260e1952b5.1617375802.git.christophe.leroy@csgroup.eu>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/a01b6cdbae01fff77e26f7a5c40ee5260e1952b5.1617375802.git.christophe.leroy@csgroup.eu/", "date": "2021-04-02T15:18:21", "name": "[v4,19/20] mips: Convert to GENERIC_CMDLINE", "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/a01b6cdbae01fff77e26f7a5c40ee5260e1952b5.1617375802.git.christophe.leroy@csgroup.eu/mbox/" } ], "headers": { "Return-Path": "\n <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org;\n receiver=<UNKNOWN>)", "lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=csgroup.eu (client-ip=93.17.236.30; helo=pegase1.c-s.fr;\n envelope-from=christophe.leroy@csgroup.eu; receiver=<UNKNOWN>)" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4F6Ndr5CGSz9s1l\n\tfor <patchwork-incoming@ozlabs.org>; Sat, 27 Mar 2021 00:50:24 +1100 (AEDT)", "from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4F6Ndr3dkcz3fNq\n\tfor <patchwork-incoming@ozlabs.org>; Sat, 27 Mar 2021 00:50:24 +1100 (AEDT)", "from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by lists.ozlabs.org (Postfix) with ESMTPS id 4F6NWn3g1bz3bwK\n for <linuxppc-dev@lists.ozlabs.org>; Sat, 27 Mar 2021 00:45:08 +1100 (AEDT)", "from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4F6NWh1kKGz9v03B;\n Fri, 26 Mar 2021 14:45:04 +0100 (CET)", "from pegase1.c-s.fr ([192.168.12.234])\n by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024)\n with ESMTP id WEkyCTIFbUwK; Fri, 26 Mar 2021 14:45:04 +0100 (CET)", "from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192])\n by pegase1.c-s.fr (Postfix) with ESMTP id 4F6NWh0R6qz9v03V;\n Fri, 26 Mar 2021 14:45:04 +0100 (CET)", "from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 7E7DC8B8CB;\n Fri, 26 Mar 2021 14:45:04 +0100 (CET)", "from messagerie.si.c-s.fr ([127.0.0.1])\n by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023)\n with ESMTP id Q_1zNYDuXI4K; Fri, 26 Mar 2021 14:45:04 +0100 (CET)", "from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id B63CD8B8D3;\n Fri, 26 Mar 2021 14:45:03 +0100 (CET)", "by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0)\n id 41E4867611; Fri, 26 Mar 2021 13:45:04 +0000 (UTC)" ], "X-Virus-Scanned": [ "Debian amavisd-new at c-s.fr", "amavisd-new at c-s.fr" ], "Message-Id": "\n <da2e403c3eab066a5b0f85d283fc1f3ba96ac749.1616765870.git.christophe.leroy@csgroup.eu>", "In-Reply-To": "<cover.1616765869.git.christophe.leroy@csgroup.eu>", "References": "<cover.1616765869.git.christophe.leroy@csgroup.eu>", "From": "Christophe Leroy <christophe.leroy@csgroup.eu>", "Subject": "[PATCH v3 16/17] mips: Convert to GENERIC_CMDLINE", "To": "will@kernel.org, danielwa@cisco.com, robh@kernel.org,\n daniel@gimpelevich.san-francisco.ca.us", "Date": "Fri, 26 Mar 2021 13:45:04 +0000 (UTC)", "X-BeenThere": "linuxppc-dev@lists.ozlabs.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/linuxppc-dev>,\n <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>", "Cc": "linux-arch@vger.kernel.org, devicetree@vger.kernel.org,\n microblaze <monstr@monstr.eu>, linux-xtensa@linux-xtensa.org,\n linux-sh@vger.kernel.org, linux-hexagon@vger.kernel.org, x86@kernel.org,\n linux-kernel@vger.kernel.org, nios2 <ley.foon.tan@intel.com>,\n linux-mips@vger.kernel.org, openrisc@lists.librecores.org,\n sparclinux@vger.kernel.org, linux-riscv@lists.infradead.org,\n linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org", "Errors-To": "linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org", "Sender": "\"Linuxppc-dev\"\n <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>" }, "content": "This converts the architecture to GENERIC_CMDLINE.\n\nSigned-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>\n---\n arch/mips/Kconfig | 1 +\n arch/mips/Kconfig.debug | 44 -----------------------\n arch/mips/configs/ar7_defconfig | 1 -\n arch/mips/configs/bcm47xx_defconfig | 1 -\n arch/mips/configs/bcm63xx_defconfig | 1 -\n arch/mips/configs/bmips_be_defconfig | 1 -\n arch/mips/configs/bmips_stb_defconfig | 1 -\n arch/mips/configs/capcella_defconfig | 1 -\n arch/mips/configs/ci20_defconfig | 1 -\n arch/mips/configs/cu1000-neo_defconfig | 1 -\n arch/mips/configs/cu1830-neo_defconfig | 1 -\n arch/mips/configs/e55_defconfig | 1 -\n arch/mips/configs/generic_defconfig | 1 -\n arch/mips/configs/gpr_defconfig | 1 -\n arch/mips/configs/loongson3_defconfig | 1 -\n arch/mips/configs/mpc30x_defconfig | 1 -\n arch/mips/configs/rt305x_defconfig | 1 -\n arch/mips/configs/tb0219_defconfig | 1 -\n arch/mips/configs/tb0226_defconfig | 1 -\n arch/mips/configs/tb0287_defconfig | 1 -\n arch/mips/configs/workpad_defconfig | 1 -\n arch/mips/configs/xway_defconfig | 1 -\n arch/mips/kernel/relocate.c | 4 +--\n arch/mips/kernel/setup.c | 40 ++-------------------\n arch/mips/pic32/pic32mzda/early_console.c | 2 +-\n arch/mips/pic32/pic32mzda/init.c | 2 --\n 26 files changed, 5 insertions(+), 108 deletions(-)", "diff": "diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig\nindex d89efba3d8a4..a65ce9ddbfce 100644\n--- a/arch/mips/Kconfig\n+++ b/arch/mips/Kconfig\n@@ -24,6 +24,7 @@ config MIPS\n \tselect CPU_NO_EFFICIENT_FFS if (TARGET_ISA_REV < 1)\n \tselect CPU_PM if CPU_IDLE\n \tselect GENERIC_ATOMIC64 if !64BIT\n+\tselect GENERIC_CMDLINE\n \tselect GENERIC_CMOS_UPDATE\n \tselect GENERIC_CPU_AUTOPROBE\n \tselect GENERIC_GETTIMEOFDAY\ndiff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug\nindex 7a8d94cdd493..b5a099c74eb6 100644\n--- a/arch/mips/Kconfig.debug\n+++ b/arch/mips/Kconfig.debug\n@@ -30,50 +30,6 @@ config EARLY_PRINTK_8250\n config USE_GENERIC_EARLY_PRINTK_8250\n \tbool\n \n-config CMDLINE_BOOL\n-\tbool \"Built-in kernel command line\"\n-\thelp\n-\t For most systems, it is firmware or second stage bootloader that\n-\t by default specifies the kernel command line options. However,\n-\t it might be necessary or advantageous to either override the\n-\t default kernel command line or add a few extra options to it.\n-\t For such cases, this option allows you to hardcode your own\n-\t command line options directly into the kernel. For that, you\n-\t should choose 'Y' here, and fill in the extra boot arguments\n-\t in CONFIG_CMDLINE.\n-\n-\t The built-in options will be concatenated to the default command\n-\t line if CMDLINE_OVERRIDE is set to 'N'. Otherwise, the default\n-\t command line will be ignored and replaced by the built-in string.\n-\n-\t Most MIPS systems will normally expect 'N' here and rely upon\n-\t the command line from the firmware or the second-stage bootloader.\n-\n-config CMDLINE\n-\tstring \"Default kernel command string\"\n-\tdepends on CMDLINE_BOOL\n-\thelp\n-\t On some platforms, there is currently no way for the boot loader to\n-\t pass arguments to the kernel. For these platforms, and for the cases\n-\t when you want to add some extra options to the command line or ignore\n-\t the default command line, you can supply some command-line options at\n-\t build time by entering them here. In other cases you can specify\n-\t kernel args so that you don't have to set them up in board prom\n-\t initialization routines.\n-\n-\t For more information, see the CMDLINE_BOOL and CMDLINE_OVERRIDE\n-\t options.\n-\n-config CMDLINE_OVERRIDE\n-\tbool \"Built-in command line overrides firmware arguments\"\n-\tdepends on CMDLINE_BOOL\n-\thelp\n-\t By setting this option to 'Y' you will have your kernel ignore\n-\t command line arguments from firmware or second stage bootloader.\n-\t Instead, the built-in command line will be used exclusively.\n-\n-\t Normally, you will choose 'N' here.\n-\n config SB1XXX_CORELIS\n \tbool \"Corelis Debugger\"\n \tdepends on SIBYTE_SB1xxx_SOC\ndiff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig\nindex cf9c6329b807..5e8adcd799d0 100644\n--- a/arch/mips/configs/ar7_defconfig\n+++ b/arch/mips/configs/ar7_defconfig\n@@ -120,5 +120,4 @@ CONFIG_SQUASHFS=y\n # CONFIG_ENABLE_MUST_CHECK is not set\n CONFIG_STRIP_ASM_SYMS=y\n CONFIG_DEBUG_FS=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"rootfstype=squashfs,jffs2\"\ndiff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47xx_defconfig\nindex 91ce75edbfb4..690f423509f0 100644\n--- a/arch/mips/configs/bcm47xx_defconfig\n+++ b/arch/mips/configs/bcm47xx_defconfig\n@@ -77,5 +77,4 @@ CONFIG_DEBUG_INFO_REDUCED=y\n CONFIG_STRIP_ASM_SYMS=y\n CONFIG_DEBUG_FS=y\n CONFIG_MAGIC_SYSRQ=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"console=ttyS0,115200\"\ndiff --git a/arch/mips/configs/bcm63xx_defconfig b/arch/mips/configs/bcm63xx_defconfig\nindex 861f680184b9..19b15424f669 100644\n--- a/arch/mips/configs/bcm63xx_defconfig\n+++ b/arch/mips/configs/bcm63xx_defconfig\n@@ -65,5 +65,4 @@ CONFIG_PROC_KCORE=y\n # CONFIG_NETWORK_FILESYSTEMS is not set\n # CONFIG_CRYPTO_HW is not set\n CONFIG_MAGIC_SYSRQ=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"console=ttyS0,115200\"\ndiff --git a/arch/mips/configs/bmips_be_defconfig b/arch/mips/configs/bmips_be_defconfig\nindex 032bb51defe8..2db7712acc5d 100644\n--- a/arch/mips/configs/bmips_be_defconfig\n+++ b/arch/mips/configs/bmips_be_defconfig\n@@ -75,5 +75,4 @@ CONFIG_NLS_ISO8859_1=y\n CONFIG_PRINTK_TIME=y\n CONFIG_DEBUG_FS=y\n CONFIG_MAGIC_SYSRQ=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon\"\ndiff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig\nindex 625bd2d7e685..bc1659d43ca7 100644\n--- a/arch/mips/configs/bmips_stb_defconfig\n+++ b/arch/mips/configs/bmips_stb_defconfig\n@@ -86,5 +86,4 @@ CONFIG_NLS_ISO8859_1=y\n CONFIG_PRINTK_TIME=y\n CONFIG_DEBUG_FS=y\n CONFIG_MAGIC_SYSRQ=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon\"\ndiff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig\nindex 7bf8971af53b..300032a5caa0 100644\n--- a/arch/mips/configs/capcella_defconfig\n+++ b/arch/mips/configs/capcella_defconfig\n@@ -87,5 +87,4 @@ CONFIG_CRYPTO_TEA=m\n CONFIG_CRYPTO_TWOFISH=m\n CONFIG_CRYPTO_DEFLATE=m\n # CONFIG_CRYPTO_HW is not set\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"mem=32M console=ttyVR0,38400\"\ndiff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defconfig\nindex ab7ebb066834..f874e421b54f 100644\n--- a/arch/mips/configs/ci20_defconfig\n+++ b/arch/mips/configs/ci20_defconfig\n@@ -203,5 +203,4 @@ CONFIG_PANIC_TIMEOUT=10\n # CONFIG_DEBUG_PREEMPT is not set\n CONFIG_STACKTRACE=y\n # CONFIG_FTRACE is not set\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon console=ttyS4,115200 clk_ignore_unused\"\ndiff --git a/arch/mips/configs/cu1000-neo_defconfig b/arch/mips/configs/cu1000-neo_defconfig\nindex 9d75f5b77d5d..03cb524967e7 100644\n--- a/arch/mips/configs/cu1000-neo_defconfig\n+++ b/arch/mips/configs/cu1000-neo_defconfig\n@@ -123,5 +123,4 @@ CONFIG_PANIC_TIMEOUT=10\n # CONFIG_DEBUG_PREEMPT is not set\n CONFIG_STACKTRACE=y\n # CONFIG_FTRACE is not set\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon clk_ignore_unused\"\ndiff --git a/arch/mips/configs/cu1830-neo_defconfig b/arch/mips/configs/cu1830-neo_defconfig\nindex 29decd0003c6..d733ccab494e 100644\n--- a/arch/mips/configs/cu1830-neo_defconfig\n+++ b/arch/mips/configs/cu1830-neo_defconfig\n@@ -126,5 +126,4 @@ CONFIG_PANIC_TIMEOUT=10\n # CONFIG_DEBUG_PREEMPT is not set\n CONFIG_STACKTRACE=y\n # CONFIG_FTRACE is not set\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon clk_ignore_unused\"\ndiff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig\nindex fd82b858a8f0..ffc964d1bae7 100644\n--- a/arch/mips/configs/e55_defconfig\n+++ b/arch/mips/configs/e55_defconfig\n@@ -33,5 +33,4 @@ CONFIG_AUTOFS4_FS=y\n CONFIG_PROC_KCORE=y\n CONFIG_TMPFS=y\n CONFIG_TMPFS_POSIX_ACL=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M\"\ndiff --git a/arch/mips/configs/generic_defconfig b/arch/mips/configs/generic_defconfig\nindex 714169e411cf..6003f6c7aa09 100644\n--- a/arch/mips/configs/generic_defconfig\n+++ b/arch/mips/configs/generic_defconfig\n@@ -88,5 +88,4 @@ CONFIG_DEBUG_INFO_REDUCED=y\n CONFIG_DEBUG_FS=y\n # CONFIG_SCHED_DEBUG is not set\n # CONFIG_FTRACE is not set\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"earlycon\"\ndiff --git a/arch/mips/configs/gpr_defconfig b/arch/mips/configs/gpr_defconfig\nindex 5cb91509bb7c..8998d28b94c8 100644\n--- a/arch/mips/configs/gpr_defconfig\n+++ b/arch/mips/configs/gpr_defconfig\n@@ -306,5 +306,4 @@ CONFIG_CRYPTO_TWOFISH=m\n CONFIG_CRYPTO_DEFLATE=m\n # CONFIG_ENABLE_MUST_CHECK is not set\n CONFIG_MAGIC_SYSRQ=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"console=ttyS0,115200 root=/dev/nfs rw ip=auto\"\ndiff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig\nindex 0e79f81217bc..c4f9a236bd1f 100644\n--- a/arch/mips/configs/loongson3_defconfig\n+++ b/arch/mips/configs/loongson3_defconfig\n@@ -408,5 +408,4 @@ CONFIG_MAGIC_SYSRQ=y\n # CONFIG_SCHED_DEBUG is not set\n # CONFIG_DEBUG_PREEMPT is not set\n # CONFIG_FTRACE is not set\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"ieee754=relaxed\"\ndiff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig\nindex d4e038802510..6ecef2a666fc 100644\n--- a/arch/mips/configs/mpc30x_defconfig\n+++ b/arch/mips/configs/mpc30x_defconfig\n@@ -49,5 +49,4 @@ CONFIG_AUTOFS4_FS=y\n CONFIG_PROC_KCORE=y\n CONFIG_CONFIGFS_FS=m\n CONFIG_NFS_FS=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73\"\ndiff --git a/arch/mips/configs/rt305x_defconfig b/arch/mips/configs/rt305x_defconfig\nindex fec5851c164b..c34441ce6621 100644\n--- a/arch/mips/configs/rt305x_defconfig\n+++ b/arch/mips/configs/rt305x_defconfig\n@@ -147,4 +147,3 @@ CONFIG_DEBUG_FS=y\n CONFIG_MAGIC_SYSRQ=y\n # CONFIG_SCHED_DEBUG is not set\n # CONFIG_FTRACE is not set\n-CONFIG_CMDLINE_BOOL=y\ndiff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig\nindex 6547f84750b5..ccf20bd156a1 100644\n--- a/arch/mips/configs/tb0219_defconfig\n+++ b/arch/mips/configs/tb0219_defconfig\n@@ -73,5 +73,4 @@ CONFIG_NFS_FS=y\n CONFIG_ROOT_NFS=y\n CONFIG_NFSD=y\n CONFIG_NFSD_V3=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs\"\ndiff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig\nindex 7e099f7c2286..9f78fd00a4f6 100644\n--- a/arch/mips/configs/tb0226_defconfig\n+++ b/arch/mips/configs/tb0226_defconfig\n@@ -68,5 +68,4 @@ CONFIG_NFS_FS=y\n CONFIG_ROOT_NFS=y\n CONFIG_NFSD=m\n CONFIG_NFSD_V3=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"cca=3 mem=32M console=ttyVR0,115200\"\ndiff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig\nindex 0d881dd862c0..5529d0dacf94 100644\n--- a/arch/mips/configs/tb0287_defconfig\n+++ b/arch/mips/configs/tb0287_defconfig\n@@ -81,5 +81,4 @@ CONFIG_NFSD_V3=y\n CONFIG_FONTS=y\n CONFIG_FONT_8x8=y\n CONFIG_FONT_8x16=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs\"\ndiff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig\nindex 891a5f77305d..ee712f7b5575 100644\n--- a/arch/mips/configs/workpad_defconfig\n+++ b/arch/mips/configs/workpad_defconfig\n@@ -61,5 +61,4 @@ CONFIG_TMPFS_POSIX_ACL=y\n CONFIG_NFS_FS=m\n CONFIG_NFSD=m\n CONFIG_NFSD_V3=y\n-CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M\"\ndiff --git a/arch/mips/configs/xway_defconfig b/arch/mips/configs/xway_defconfig\nindex 9abbc0debc2a..ebd8dbdb0695 100644\n--- a/arch/mips/configs/xway_defconfig\n+++ b/arch/mips/configs/xway_defconfig\n@@ -153,4 +153,3 @@ CONFIG_DEBUG_FS=y\n CONFIG_MAGIC_SYSRQ=y\n # CONFIG_SCHED_DEBUG is not set\n # CONFIG_FTRACE is not set\n-CONFIG_CMDLINE_BOOL=y\ndiff --git a/arch/mips/kernel/relocate.c b/arch/mips/kernel/relocate.c\nindex 499a5357c09f..13c955027696 100644\n--- a/arch/mips/kernel/relocate.c\n+++ b/arch/mips/kernel/relocate.c\n@@ -244,15 +244,13 @@ static inline __init unsigned long get_random_boot(void)\n static inline __init bool kaslr_disabled(void)\n {\n \tchar *str;\n-\n-#if defined(CONFIG_CMDLINE_BOOL)\n \tconst char *builtin_cmdline = CONFIG_CMDLINE;\n \n \tstr = strstr(builtin_cmdline, \"nokaslr\");\n \tif (str == builtin_cmdline ||\n \t (str > builtin_cmdline && *(str - 1) == ' '))\n \t\treturn true;\n-#endif\n+\n \tstr = strstr(arcs_cmdline, \"nokaslr\");\n \tif (str == arcs_cmdline || (str > arcs_cmdline && *(str - 1) == ' '))\n \t\treturn true;\ndiff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c\nindex 279be0153f8b..e1ba44843c49 100644\n--- a/arch/mips/kernel/setup.c\n+++ b/arch/mips/kernel/setup.c\n@@ -29,6 +29,7 @@\n #include <linux/of_fdt.h>\n #include <linux/dmi.h>\n #include <linux/crash_dump.h>\n+#include <linux/cmdline.h>\n \n #include <asm/addrspace.h>\n #include <asm/bootinfo.h>\n@@ -66,12 +67,6 @@ EXPORT_SYMBOL(mips_machtype);\n static char __initdata command_line[COMMAND_LINE_SIZE];\n char __initdata arcs_cmdline[COMMAND_LINE_SIZE];\n \n-#ifdef CONFIG_CMDLINE_BOOL\n-static const char builtin_cmdline[] __initconst = CONFIG_CMDLINE;\n-#else\n-static const char builtin_cmdline[] __initconst = \"\";\n-#endif\n-\n /*\n * mips_io_port_base is the begin of the address space to which x86 style\n * I/O ports are mapped.\n@@ -546,28 +541,6 @@ static void __init bootcmdline_init(void)\n {\n \tbool dt_bootargs = false;\n \n-\t/*\n-\t * If CMDLINE_OVERRIDE is enabled then initializing the command line is\n-\t * trivial - we simply use the built-in command line unconditionally &\n-\t * unmodified.\n-\t */\n-\tif (IS_ENABLED(CONFIG_CMDLINE_OVERRIDE)) {\n-\t\tstrlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);\n-\t\treturn;\n-\t}\n-\n-\t/*\n-\t * If the user specified a built-in command line &\n-\t * MIPS_CMDLINE_BUILTIN_EXTEND, then the built-in command line is\n-\t * prepended to arguments from the bootloader or DT so we'll copy them\n-\t * to the start of boot_command_line here. Otherwise, empty\n-\t * boot_command_line to undo anything early_init_dt_scan_chosen() did.\n-\t */\n-\tif (IS_ENABLED(CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND))\n-\t\tstrlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);\n-\telse\n-\t\tboot_command_line[0] = 0;\n-\n #ifdef CONFIG_OF_EARLY_FLATTREE\n \t/*\n \t * If we're configured to take boot arguments from DT, look for those\n@@ -585,16 +558,7 @@ static void __init bootcmdline_init(void)\n \t * plat_mem_setup() should have filled arcs_cmdline with arguments from\n \t * the bootloader.\n \t */\n-\tif (IS_ENABLED(CONFIG_MIPS_CMDLINE_DTB_EXTEND) || !dt_bootargs)\n-\t\tbootcmdline_append(arcs_cmdline, COMMAND_LINE_SIZE);\n-\n-\t/*\n-\t * If the user specified a built-in command line & we didn't already\n-\t * prepend it, we append it to boot_command_line here.\n-\t */\n-\tif (IS_ENABLED(CONFIG_CMDLINE_BOOL) &&\n-\t !IS_ENABLED(CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND))\n-\t\tbootcmdline_append(builtin_cmdline, COMMAND_LINE_SIZE);\n+\tcmdline_build(boot_command_line, arcs_cmdline, COMMAND_LINE_SIZE);\n }\n \n /*\ndiff --git a/arch/mips/pic32/pic32mzda/early_console.c b/arch/mips/pic32/pic32mzda/early_console.c\nindex 25372e62783b..94d3a5ba5e10 100644\n--- a/arch/mips/pic32/pic32mzda/early_console.c\n+++ b/arch/mips/pic32/pic32mzda/early_console.c\n@@ -75,7 +75,7 @@ static char * __init pic32_getcmdline(void)\n \t * arch_mem_init() has not been called yet, so we don't have a real\n \t * command line setup if using CONFIG_CMDLINE_BOOL.\n \t */\n-#ifdef CONFIG_CMDLINE_OVERRIDE\n+#ifdef CONFIG_CMDLINE_FORCE\n \treturn CONFIG_CMDLINE;\n #else\n \treturn fw_getcmdline();\ndiff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/init.c\nindex 764f2d022fae..39fdacbbac56 100644\n--- a/arch/mips/pic32/pic32mzda/init.c\n+++ b/arch/mips/pic32/pic32mzda/init.c\n@@ -40,9 +40,7 @@ void __init plat_mem_setup(void)\n \tpr_info(\"Found following command lines\\n\");\n \tpr_info(\" boot_command_line: %s\\n\", boot_command_line);\n \tpr_info(\" arcs_cmdline : %s\\n\", arcs_cmdline);\n-#ifdef CONFIG_CMDLINE_BOOL\n \tpr_info(\" builtin_cmdline : %s\\n\", CONFIG_CMDLINE);\n-#endif\n \tif (dtb != __dtb_start)\n \t\tstrlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);\n \n", "prefixes": [ "v3", "16/17" ] }