{"id":1461769,"url":"http://patchwork.ozlabs.org/api/patches/1461769/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/56269e717991d446112958ecf7340ce095b371a6.1617375802.git.christophe.leroy@csgroup.eu/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","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":"<56269e717991d446112958ecf7340ce095b371a6.1617375802.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/56269e717991d446112958ecf7340ce095b371a6.1617375802.git.christophe.leroy@csgroup.eu/","date":"2021-04-02T15:18:17","name":"[v4,15/20] sh: Convert to GENERIC_CMDLINE","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"1009c2af1f7031b9d0ddb97623ba58980961d778","submitter":{"id":79086,"url":"http://patchwork.ozlabs.org/api/people/79086/?format=json","name":"Christophe Leroy","email":"christophe.leroy@csgroup.eu"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/56269e717991d446112958ecf7340ce095b371a6.1617375802.git.christophe.leroy@csgroup.eu/mbox/","series":[{"id":237158,"url":"http://patchwork.ozlabs.org/api/series/237158/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=237158","date":"2021-04-02T15:18:03","name":"Implement GENERIC_CMDLINE","version":4,"mbox":"http://patchwork.ozlabs.org/series/237158/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1461769/comments/","check":"success","checks":"http://patchwork.ozlabs.org/api/patches/1461769/checks/","tags":{},"related":[{"id":1458810,"url":"http://patchwork.ozlabs.org/api/patches/1458810/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/6b76649009943f2893fdfded22becd41db2fe1f7.1616765870.git.christophe.leroy@csgroup.eu/","msgid":"<6b76649009943f2893fdfded22becd41db2fe1f7.1616765870.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/6b76649009943f2893fdfded22becd41db2fe1f7.1616765870.git.christophe.leroy@csgroup.eu/","date":"2021-03-26T13:44:59","name":"[v3,12/17] sh: Convert to GENERIC_CMDLINE","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/6b76649009943f2893fdfded22becd41db2fe1f7.1616765870.git.christophe.leroy@csgroup.eu/mbox/"}],"headers":{"Return-Path":"\n ","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=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org;\n receiver=)","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=)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org\n [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1])\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 4FBkN74PcTz9sRf\n\tfor ; Sat, 3 Apr 2021 02:23:35 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4FBkN73ffJz3fLt\n\tfor ; Sat, 3 Apr 2021 02:23:35 +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 4FBkG44kTlz3c0Y\n for ; Sat, 3 Apr 2021 02:18:20 +1100 (AEDT)","from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4FBkG01f94z9v2m6;\n Fri, 2 Apr 2021 17:18:16 +0200 (CEST)","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 swV5Eg2aMaDR; Fri, 2 Apr 2021 17:18:16 +0200 (CEST)","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 4FBkG00Z8Wz9v2ls;\n Fri, 2 Apr 2021 17:18:16 +0200 (CEST)","from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id BFA948BB7D;\n Fri, 2 Apr 2021 17:18:17 +0200 (CEST)","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 GNJUI4yPQWh2; Fri, 2 Apr 2021 17:18:17 +0200 (CEST)","from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 3D51D8BB7C;\n Fri, 2 Apr 2021 17:18:17 +0200 (CEST)","by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0)\n id 1A5C167989; Fri, 2 Apr 2021 15:18:17 +0000 (UTC)"],"X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Message-Id":"\n <56269e717991d446112958ecf7340ce095b371a6.1617375802.git.christophe.leroy@csgroup.eu>","In-Reply-To":"","References":"","From":"Christophe Leroy ","Subject":"[PATCH v4 15/20] sh: Convert to GENERIC_CMDLINE","To":"will@kernel.org, danielwa@cisco.com, robh@kernel.org,\n daniel@gimpelevich.san-francisco.ca.us, arnd@kernel.org,\n akpm@linux-foundation.org","Date":"Fri, 2 Apr 2021 15:18:17 +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 ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"linux-arch@vger.kernel.org, devicetree@vger.kernel.org,\n microblaze , 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 ,\n linux-mips@vger.kernel.org, linux-mm@kvack.org,\n 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 "},"content":"This converts the architecture to GENERIC_CMDLINE.\n\nSigned-off-by: Christophe Leroy \n---\nv4: Restore the removed 'endmenu' in Kconfig\n---\n arch/sh/Kconfig | 28 +--------------------\n arch/sh/configs/ap325rxa_defconfig | 2 +-\n arch/sh/configs/dreamcast_defconfig | 2 +-\n arch/sh/configs/ecovec24-romimage_defconfig | 2 +-\n arch/sh/configs/ecovec24_defconfig | 2 +-\n arch/sh/configs/edosk7760_defconfig | 2 +-\n arch/sh/configs/espt_defconfig | 2 +-\n arch/sh/configs/j2_defconfig | 2 +-\n arch/sh/configs/kfr2r09-romimage_defconfig | 2 +-\n arch/sh/configs/kfr2r09_defconfig | 2 +-\n arch/sh/configs/lboxre2_defconfig | 2 +-\n arch/sh/configs/microdev_defconfig | 2 +-\n arch/sh/configs/migor_defconfig | 2 +-\n arch/sh/configs/polaris_defconfig | 2 +-\n arch/sh/configs/r7780mp_defconfig | 2 +-\n arch/sh/configs/r7785rp_defconfig | 2 +-\n arch/sh/configs/rsk7201_defconfig | 2 +-\n arch/sh/configs/rsk7203_defconfig | 2 +-\n arch/sh/configs/rts7751r2d1_defconfig | 2 +-\n arch/sh/configs/rts7751r2dplus_defconfig | 2 +-\n arch/sh/configs/sdk7780_defconfig | 2 +-\n arch/sh/configs/sdk7786_defconfig | 2 +-\n arch/sh/configs/se7206_defconfig | 2 +-\n arch/sh/configs/se7343_defconfig | 2 +-\n arch/sh/configs/se7712_defconfig | 2 +-\n arch/sh/configs/se7721_defconfig | 2 +-\n arch/sh/configs/se7724_defconfig | 2 +-\n arch/sh/configs/se7751_defconfig | 2 +-\n arch/sh/configs/se7780_defconfig | 2 +-\n arch/sh/configs/sh03_defconfig | 2 +-\n arch/sh/configs/sh2007_defconfig | 2 +-\n arch/sh/configs/sh7757lcr_defconfig | 2 +-\n arch/sh/configs/sh7763rdp_defconfig | 2 +-\n arch/sh/configs/shmin_defconfig | 2 +-\n arch/sh/configs/shx3_defconfig | 2 +-\n arch/sh/configs/titan_defconfig | 2 +-\n arch/sh/configs/ul2_defconfig | 2 +-\n arch/sh/kernel/setup.c | 11 ++------\n 38 files changed, 39 insertions(+), 72 deletions(-)","diff":"diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig\nindex e798e55915c2..92d6a4443166 100644\n--- a/arch/sh/Kconfig\n+++ b/arch/sh/Kconfig\n@@ -16,6 +16,7 @@ config SUPERH\n \tselect CPU_NO_EFFICIENT_FFS\n \tselect DMA_DECLARE_COHERENT\n \tselect GENERIC_ATOMIC64\n+\tselect GENERIC_CMDLINE\n \tselect GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST\n \tselect GENERIC_IDLE_POLL_SETUP\n \tselect GENERIC_IRQ_SHOW\n@@ -742,33 +743,6 @@ config ROMIMAGE_MMCIF\n \t first part of the romImage which in turn loads the rest the kernel\n \t image to RAM using the MMCIF hardware block.\n \n-choice\n-\tprompt \"Kernel command line\"\n-\toptional\n-\tdefault CMDLINE_OVERWRITE\n-\thelp\n-\t Setting this option allows the kernel command line arguments\n-\t to be set.\n-\n-config CMDLINE_OVERWRITE\n-\tbool \"Overwrite bootloader kernel arguments\"\n-\thelp\n-\t Given string will overwrite any arguments passed in by\n-\t a bootloader.\n-\n-config CMDLINE_EXTEND\n-\tbool \"Extend bootloader kernel arguments\"\n-\thelp\n-\t Given string will be concatenated with arguments passed in\n-\t by a bootloader.\n-\n-endchoice\n-\n-config CMDLINE\n-\tstring \"Kernel command line arguments string\"\n-\tdepends on CMDLINE_OVERWRITE || CMDLINE_EXTEND\n-\tdefault \"console=ttySC1,115200\"\n-\n endmenu\n \n menu \"Bus options\"\ndiff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig\nindex 5193b3e099b9..3997aa49c75b 100644\n--- a/arch/sh/configs/ap325rxa_defconfig\n+++ b/arch/sh/configs/ap325rxa_defconfig\n@@ -15,7 +15,7 @@ CONFIG_SH_AP325RXA=y\n CONFIG_HIGH_RES_TIMERS=y\n CONFIG_SECCOMP=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=tty1 console=ttySC5,38400 root=/dev/nfs ip=dhcp\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig\nindex 6a82c7b8ff32..ac030c1a351e 100644\n--- a/arch/sh/configs/dreamcast_defconfig\n+++ b/arch/sh/configs/dreamcast_defconfig\n@@ -22,7 +22,7 @@ CONFIG_NR_DMA_CHANNELS_BOOL=y\n CONFIG_NR_DMA_CHANNELS=9\n CONFIG_SECCOMP=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC1,115200 panic=3\"\n CONFIG_MAPLE=y\n CONFIG_PCI=y\ndiff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig\nindex 5c60e71d839e..db78857ae30f 100644\n--- a/arch/sh/configs/ecovec24-romimage_defconfig\n+++ b/arch/sh/configs/ecovec24-romimage_defconfig\n@@ -14,7 +14,7 @@ CONFIG_FLATMEM_MANUAL=y\n CONFIG_SH_ECOVEC=y\n # CONFIG_SH_TIMER_TMU is not set\n CONFIG_KEXEC=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200\"\n # CONFIG_SUSPEND is not set\n CONFIG_NET=y\ndiff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig\nindex 03cb916819fa..f6f7d2e1840d 100644\n--- a/arch/sh/configs/ecovec24_defconfig\n+++ b/arch/sh/configs/ecovec24_defconfig\n@@ -16,7 +16,7 @@ CONFIG_SH_ECOVEC=y\n CONFIG_HEARTBEAT=y\n CONFIG_SECCOMP=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=tty0, console=ttySC0,115200 root=/dev/nfs ip=dhcp mem=248M memchunk.vpu=8m memchunk.veu0=4m\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig\nindex d77f54e906fd..1ac8eb89c550 100644\n--- a/arch/sh/configs/edosk7760_defconfig\n+++ b/arch/sh/configs/edosk7760_defconfig\n@@ -19,7 +19,7 @@ CONFIG_HIGH_RES_TIMERS=y\n CONFIG_SH_DMA=y\n CONFIG_SH_DMA_API=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"mem=64M console=ttySC2,115200 root=/dev/nfs rw nfsroot=192.168.0.3:/scripts/filesys ip=192.168.0.4\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/espt_defconfig b/arch/sh/configs/espt_defconfig\nindex 2804cb760a76..1bffacbaba3d 100644\n--- a/arch/sh/configs/espt_defconfig\n+++ b/arch/sh/configs/espt_defconfig\n@@ -14,7 +14,7 @@ CONFIG_MEMORY_START=0x0c000000\n CONFIG_SH_ESPT=y\n CONFIG_SH_PCLK_FREQ=66666666\n CONFIG_SECCOMP=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 root=/dev/nfs ip=bootp\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/j2_defconfig b/arch/sh/configs/j2_defconfig\nindex 2eb81ebe3888..983c62e936eb 100644\n--- a/arch/sh/configs/j2_defconfig\n+++ b/arch/sh/configs/j2_defconfig\n@@ -10,7 +10,7 @@ CONFIG_CPU_BIG_ENDIAN=y\n CONFIG_SH_DEVICE_TREE=y\n CONFIG_SH_JCORE_SOC=y\n CONFIG_HZ_100=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttyUL0 earlycon\"\n CONFIG_BINFMT_ELF_FDPIC=y\n CONFIG_BINFMT_FLAT=y\ndiff --git a/arch/sh/configs/kfr2r09-romimage_defconfig b/arch/sh/configs/kfr2r09-romimage_defconfig\nindex 04436b4fbd76..8418c1f0c1ce 100644\n--- a/arch/sh/configs/kfr2r09-romimage_defconfig\n+++ b/arch/sh/configs/kfr2r09-romimage_defconfig\n@@ -15,7 +15,7 @@ CONFIG_SH_KFR2R09=y\n # CONFIG_SH_TIMER_TMU is not set\n CONFIG_HZ_100=y\n CONFIG_KEXEC=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC1,115200 quiet\"\n # CONFIG_SUSPEND is not set\n CONFIG_NET=y\ndiff --git a/arch/sh/configs/kfr2r09_defconfig b/arch/sh/configs/kfr2r09_defconfig\nindex 833404490cfe..0b04d179ebba 100644\n--- a/arch/sh/configs/kfr2r09_defconfig\n+++ b/arch/sh/configs/kfr2r09_defconfig\n@@ -19,7 +19,7 @@ CONFIG_NO_HZ=y\n CONFIG_HZ_1000=y\n CONFIG_KEXEC=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=tty0 console=ttySC1,115200\"\n # CONFIG_SUSPEND is not set\n CONFIG_CPU_IDLE=y\ndiff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig\nindex 05e4ac6fed5f..498c88953d2a 100644\n--- a/arch/sh/configs/lboxre2_defconfig\n+++ b/arch/sh/configs/lboxre2_defconfig\n@@ -12,7 +12,7 @@ CONFIG_FLATMEM_MANUAL=y\n CONFIG_SH_LBOX_RE2=y\n CONFIG_SH_PCLK_FREQ=40000000\n CONFIG_KEXEC=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC1,115200 root=/dev/sda1\"\n CONFIG_PCI=y\n CONFIG_PCCARD=y\ndiff --git a/arch/sh/configs/microdev_defconfig b/arch/sh/configs/microdev_defconfig\nindex e9825196dd66..8467de1d3092 100644\n--- a/arch/sh/configs/microdev_defconfig\n+++ b/arch/sh/configs/microdev_defconfig\n@@ -11,7 +11,7 @@ CONFIG_SH_DMA=y\n CONFIG_SH_DMA_API=y\n CONFIG_HEARTBEAT=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 root=/dev/hda1\"\n CONFIG_SUPERHYWAY=y\n CONFIG_NET=y\ndiff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig\nindex 4859cd30cfc4..e43fb2a63f1f 100644\n--- a/arch/sh/configs/migor_defconfig\n+++ b/arch/sh/configs/migor_defconfig\n@@ -15,7 +15,7 @@ CONFIG_NUMA=y\n CONFIG_SH_MIGOR=y\n # CONFIG_SH_TIMER_CMT is not set\n CONFIG_SECCOMP=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=tty0 console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig\nindex 246408ec7462..2fc2bdc0e002 100644\n--- a/arch/sh/configs/polaris_defconfig\n+++ b/arch/sh/configs/polaris_defconfig\n@@ -25,7 +25,7 @@ CONFIG_SH_DMA_API=y\n CONFIG_HEARTBEAT=y\n CONFIG_HZ_100=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC1,115200 root=/dev/mtdblock2 rootfstype=jffs2 mem=63M mtdparts=physmap-flash.0:0x00100000(bootloader)ro,0x00500000(Kernel)ro,0x00A00000(Filesystem)\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig\nindex f823cc6b18f9..9e2438114890 100644\n--- a/arch/sh/configs/r7780mp_defconfig\n+++ b/arch/sh/configs/r7780mp_defconfig\n@@ -20,7 +20,7 @@ CONFIG_SH_PCLK_FREQ=33333333\n CONFIG_PUSH_SWITCH=y\n CONFIG_KEXEC=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 root=/dev/sda1\"\n CONFIG_PCI=y\n CONFIG_NET=y\ndiff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig\nindex f96bc20d4b1a..c1c92f154694 100644\n--- a/arch/sh/configs/r7785rp_defconfig\n+++ b/arch/sh/configs/r7785rp_defconfig\n@@ -26,7 +26,7 @@ CONFIG_HEARTBEAT=y\n CONFIG_PUSH_SWITCH=y\n CONFIG_KEXEC=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 root=/dev/sda1\"\n CONFIG_PCI=y\n CONFIG_BINFMT_MISC=m\ndiff --git a/arch/sh/configs/rsk7201_defconfig b/arch/sh/configs/rsk7201_defconfig\nindex e41526120be1..65f3d695bc78 100644\n--- a/arch/sh/configs/rsk7201_defconfig\n+++ b/arch/sh/configs/rsk7201_defconfig\n@@ -21,7 +21,7 @@ CONFIG_CPU_BIG_ENDIAN=y\n CONFIG_SH_RSK=y\n CONFIG_SH_PCLK_FREQ=40000000\n CONFIG_HZ_1000=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 earlyprintk=serial ignore_loglevel\"\n CONFIG_BINFMT_FLAT=y\n CONFIG_BINFMT_ZFLAT=y\ndiff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig\nindex 6af08fa1ddf8..33f608c54b85 100644\n--- a/arch/sh/configs/rsk7203_defconfig\n+++ b/arch/sh/configs/rsk7203_defconfig\n@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y\n CONFIG_SH_CPU_FREQ=y\n CONFIG_HEARTBEAT=y\n CONFIG_HZ_1000=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 earlyprintk=serial ignore_loglevel\"\n CONFIG_BINFMT_FLAT=y\n CONFIG_BINFMT_ZFLAT=y\ndiff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig\nindex 96263a4912b7..131699a6daa7 100644\n--- a/arch/sh/configs/rts7751r2d1_defconfig\n+++ b/arch/sh/configs/rts7751r2d1_defconfig\n@@ -11,7 +11,7 @@ CONFIG_FLATMEM_MANUAL=y\n CONFIG_SH_RTS7751R2D=y\n CONFIG_RTS7751R2D_1=y\n CONFIG_HEARTBEAT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=tty0 console=ttySC1,115200 root=/dev/sda1\"\n CONFIG_PCI=y\n CONFIG_HOTPLUG_PCI=y\ndiff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig\nindex 92e586e6c974..ffa76ad8efaa 100644\n--- a/arch/sh/configs/rts7751r2dplus_defconfig\n+++ b/arch/sh/configs/rts7751r2dplus_defconfig\n@@ -11,7 +11,7 @@ CONFIG_FLATMEM_MANUAL=y\n CONFIG_SH_RTS7751R2D=y\n CONFIG_RTS7751R2D_PLUS=y\n CONFIG_HEARTBEAT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=tty0 console=ttySC1,115200 root=/dev/sda1\"\n CONFIG_PCI=y\n CONFIG_HOTPLUG_PCI=y\ndiff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig\nindex 6c719ab4332a..a33f81c41a13 100644\n--- a/arch/sh/configs/sdk7780_defconfig\n+++ b/arch/sh/configs/sdk7780_defconfig\n@@ -22,7 +22,7 @@ CONFIG_SH_DMA=y\n CONFIG_SH_DMA_API=y\n CONFIG_HEARTBEAT=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"mem=128M console=tty0 console=ttySC0,115200 ip=bootp root=/dev/nfs nfsroot=192.168.0.1:/home/rootfs\"\n CONFIG_PCI=y\n CONFIG_PCI_DEBUG=y\ndiff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig\nindex f776a1d0d277..1daf3dbffc16 100644\n--- a/arch/sh/configs/sdk7786_defconfig\n+++ b/arch/sh/configs/sdk7786_defconfig\n@@ -70,7 +70,7 @@ CONFIG_HOTPLUG_CPU=y\n CONFIG_PREEMPT=y\n CONFIG_INTC_USERIMASK=y\n CONFIG_INTC_BALANCING=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC1,115200 earlyprintk=sh-sci.1,115200 root=/dev/sda1 nmi_debug=state,debounce rootdelay=5 pmb=iomap ignore_loglevel\"\n CONFIG_PCI=y\n CONFIG_PCIEPORTBUS=y\ndiff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig\nindex 315b04a8dd2f..c729ddb5d2c8 100644\n--- a/arch/sh/configs/se7206_defconfig\n+++ b/arch/sh/configs/se7206_defconfig\n@@ -36,7 +36,7 @@ CONFIG_SH_CPU_FREQ=y\n CONFIG_HEARTBEAT=y\n CONFIG_HZ_1000=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC3,115200 ignore_loglevel earlyprintk=serial\"\n CONFIG_BINFMT_FLAT=y\n CONFIG_BINFMT_ZFLAT=y\ndiff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig\nindex 5d6c19338ebf..32fedfd8ae81 100644\n--- a/arch/sh/configs/se7343_defconfig\n+++ b/arch/sh/configs/se7343_defconfig\n@@ -17,7 +17,7 @@ CONFIG_FLATMEM_MANUAL=y\n CONFIG_SH_7343_SOLUTION_ENGINE=y\n # CONFIG_SH_TIMER_CMT is not set\n CONFIG_HEARTBEAT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig\nindex ee6d28ae08de..02a8dcb898db 100644\n--- a/arch/sh/configs/se7712_defconfig\n+++ b/arch/sh/configs/se7712_defconfig\n@@ -22,7 +22,7 @@ CONFIG_SH_SOLUTION_ENGINE=y\n CONFIG_SH_PCLK_FREQ=66666666\n CONFIG_HEARTBEAT=y\n CONFIG_PREEMPT_VOLUNTARY=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 root=/dev/sda1\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/se7721_defconfig b/arch/sh/configs/se7721_defconfig\nindex bad921bc10f8..a0ce6eca3bf5 100644\n--- a/arch/sh/configs/se7721_defconfig\n+++ b/arch/sh/configs/se7721_defconfig\n@@ -22,7 +22,7 @@ CONFIG_SH_7721_SOLUTION_ENGINE=y\n CONFIG_SH_PCLK_FREQ=33333333\n CONFIG_HEARTBEAT=y\n CONFIG_PREEMPT_VOLUNTARY=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 root=/dev/sda2\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig\nindex a26f7f1841c7..9cd50acd959d 100644\n--- a/arch/sh/configs/se7724_defconfig\n+++ b/arch/sh/configs/se7724_defconfig\n@@ -17,7 +17,7 @@ CONFIG_SH_DMA_API=y\n CONFIG_HEARTBEAT=y\n CONFIG_SECCOMP=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=tty1 console=ttySC3,115200 root=/dev/nfs ip=dhcp memchunk.vpu=4m\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/se7751_defconfig b/arch/sh/configs/se7751_defconfig\nindex 4a024065bb75..8c2beb3677e2 100644\n--- a/arch/sh/configs/se7751_defconfig\n+++ b/arch/sh/configs/se7751_defconfig\n@@ -12,7 +12,7 @@ CONFIG_MEMORY_START=0x0c000000\n CONFIG_FLATMEM_MANUAL=y\n CONFIG_SH_7751_SOLUTION_ENGINE=y\n CONFIG_HEARTBEAT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC1,38400\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defconfig\nindex dcd85b858ac8..3be23f65c38e 100644\n--- a/arch/sh/configs/se7780_defconfig\n+++ b/arch/sh/configs/se7780_defconfig\n@@ -14,7 +14,7 @@ CONFIG_MEMORY_SIZE=0x08000000\n CONFIG_SH_7780_SOLUTION_ENGINE=y\n CONFIG_SH_PCLK_FREQ=33333333\n CONFIG_HEARTBEAT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 root=/dev/sda1\"\n CONFIG_PCI=y\n CONFIG_NET=y\ndiff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig\nindex ff502683132e..87e9805b76d0 100644\n--- a/arch/sh/configs/sh03_defconfig\n+++ b/arch/sh/configs/sh03_defconfig\n@@ -16,7 +16,7 @@ CONFIG_FLATMEM_MANUAL=y\n CONFIG_SH_SH03=y\n CONFIG_HEARTBEAT=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC1,115200 mem=64M root=/dev/nfs\"\n CONFIG_PCI=y\n CONFIG_HOTPLUG_PCI=y\ndiff --git a/arch/sh/configs/sh2007_defconfig b/arch/sh/configs/sh2007_defconfig\nindex 99975db461d8..8e92c58316db 100644\n--- a/arch/sh/configs/sh2007_defconfig\n+++ b/arch/sh/configs/sh2007_defconfig\n@@ -20,7 +20,7 @@ CONFIG_SH_DMA=y\n CONFIG_SH_DMA_API=y\n CONFIG_NR_DMA_CHANNELS_BOOL=y\n CONFIG_HZ_100=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC1,115200 ip=dhcp root=/dev/nfs rw nfsroot=/nfs/rootfs,rsize=1024,wsize=1024 earlyprintk=sh-sci.1\"\n CONFIG_PCCARD=y\n CONFIG_BINFMT_MISC=y\ndiff --git a/arch/sh/configs/sh7757lcr_defconfig b/arch/sh/configs/sh7757lcr_defconfig\nindex a2700ab165af..a15877daff16 100644\n--- a/arch/sh/configs/sh7757lcr_defconfig\n+++ b/arch/sh/configs/sh7757lcr_defconfig\n@@ -21,7 +21,7 @@ CONFIG_FLATMEM_MANUAL=y\n CONFIG_SH_SH7757LCR=y\n CONFIG_HEARTBEAT=y\n CONFIG_SECCOMP=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC2,115200 root=/dev/nfs ip=dhcp\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig\nindex 8a6a446f9eb8..351ccabac8a6 100644\n--- a/arch/sh/configs/sh7763rdp_defconfig\n+++ b/arch/sh/configs/sh7763rdp_defconfig\n@@ -14,7 +14,7 @@ CONFIG_MEMORY_START=0x0c000000\n CONFIG_SH_SH7763RDP=y\n CONFIG_SH_PCLK_FREQ=66666666\n CONFIG_SECCOMP=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC2,115200 root=/dev/sda1 rootdelay=10\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/configs/shmin_defconfig b/arch/sh/configs/shmin_defconfig\nindex c0b6f40d01cc..7cc8725951f5 100644\n--- a/arch/sh/configs/shmin_defconfig\n+++ b/arch/sh/configs/shmin_defconfig\n@@ -18,7 +18,7 @@ CONFIG_FLATMEM_MANUAL=y\n # CONFIG_SH_ADC is not set\n CONFIG_SH_SHMIN=y\n CONFIG_SH_PCLK_FREQ=32000000\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC1,115200 root=1f01 mtdparts=phys_mapped_flash:64k(firm)ro,-(sys) netdev=34,0x300,eth0 \"\n CONFIG_NET=y\n CONFIG_UNIX=y\ndiff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig\nindex 32ec6eb1eabc..36cac3067cef 100644\n--- a/arch/sh/configs/shx3_defconfig\n+++ b/arch/sh/configs/shx3_defconfig\n@@ -47,7 +47,7 @@ CONFIG_KEXEC=y\n CONFIG_SECCOMP=y\n CONFIG_SMP=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 earlyprintk=bios ignore_loglevel\"\n CONFIG_BINFMT_MISC=y\n CONFIG_NET=y\ndiff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig\nindex ba887f1351be..5aa513d54df0 100644\n--- a/arch/sh/configs/titan_defconfig\n+++ b/arch/sh/configs/titan_defconfig\n@@ -20,7 +20,7 @@ CONFIG_SH_PCLK_FREQ=30000000\n CONFIG_SH_DMA=y\n CONFIG_SH_DMA_API=y\n CONFIG_PREEMPT_VOLUNTARY=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf rw\"\n CONFIG_PCI=y\n CONFIG_HOTPLUG_PCI=y\ndiff --git a/arch/sh/configs/ul2_defconfig b/arch/sh/configs/ul2_defconfig\nindex 103b81ec1ffb..8d8b6787302f 100644\n--- a/arch/sh/configs/ul2_defconfig\n+++ b/arch/sh/configs/ul2_defconfig\n@@ -18,7 +18,7 @@ CONFIG_HIGH_RES_TIMERS=y\n CONFIG_HZ_100=y\n CONFIG_KEXEC=y\n CONFIG_PREEMPT=y\n-CONFIG_CMDLINE_OVERWRITE=y\n+CONFIG_CMDLINE_FORCE=y\n CONFIG_CMDLINE=\"console=ttySC0,115200 root=/dev/nfs ip=dhcp\"\n CONFIG_NET=y\n CONFIG_PACKET=y\ndiff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c\nindex 4144be650d41..464ccbbd8205 100644\n--- a/arch/sh/kernel/setup.c\n+++ b/arch/sh/kernel/setup.c\n@@ -32,6 +32,7 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n #include \n@@ -306,15 +307,7 @@ void __init setup_arch(char **cmdline_p)\n \tbss_resource.start = virt_to_phys(__bss_start);\n \tbss_resource.end = virt_to_phys(__bss_stop)-1;\n \n-#ifdef CONFIG_CMDLINE_OVERWRITE\n-\tstrlcpy(command_line, CONFIG_CMDLINE, sizeof(command_line));\n-#else\n-\tstrlcpy(command_line, COMMAND_LINE, sizeof(command_line));\n-#ifdef CONFIG_CMDLINE_EXTEND\n-\tstrlcat(command_line, \" \", sizeof(command_line));\n-\tstrlcat(command_line, CONFIG_CMDLINE, sizeof(command_line));\n-#endif\n-#endif\n+\tcmdline_build(command_line, COMMAND_LINE);\n \n \t/* Save unparsed command line copy for /proc/cmdline */\n \tmemcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);\n","prefixes":["v4","15/20"]}