{"id":1460186,"url":"http://patchwork.ozlabs.org/api/patches/1460186/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/ee6b727a83a936c521d7d746669726e22ab8b642.1617126961.git.danielwa@cisco.com/","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":"","list_archive_url":"https://lore.kernel.org/linuxppc-dev/ee6b727a83a936c521d7d746669726e22ab8b642.1617126961.git.danielwa@cisco.com/","date":"2021-03-30T17:57:00","name":"[5/8] CMDLINE: mips: convert to generic builtin command line","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"44b6bedd1d7e0c76cad23e0f30987bacfb6dcca3","submitter":{"id":67374,"url":"http://patchwork.ozlabs.org/api/people/67374/?format=json","name":"Daniel Walker (danielwa)","email":"danielwa@cisco.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/ee6b727a83a936c521d7d746669726e22ab8b642.1617126961.git.danielwa@cisco.com/mbox/","series":[{"id":236583,"url":"http://patchwork.ozlabs.org/api/series/236583/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=236583","date":"2021-03-30T17:56:56","name":"[1/8] CMDLINE: add generic builtin command line","version":1,"mbox":"http://patchwork.ozlabs.org/series/236583/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1460186/comments/","check":"warning","checks":"http://patchwork.ozlabs.org/api/patches/1460186/checks/","tags":{},"related":[{"id":1449487,"url":"http://patchwork.ozlabs.org/api/patches/1449487/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210309000247.2989531-7-danielwa@cisco.com/","msgid":"<20210309000247.2989531-7-danielwa@cisco.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20210309000247.2989531-7-danielwa@cisco.com/","date":"2021-03-09T00:02:42","name":"[v2,6/7] CMDLINE: mips: convert to generic builtin command line","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210309000247.2989531-7-danielwa@cisco.com/mbox/"},{"id":1466835,"url":"http://patchwork.ozlabs.org/api/patches/1466835/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210416040924.2882771-5-danielwa@cisco.com/","msgid":"<20210416040924.2882771-5-danielwa@cisco.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20210416040924.2882771-5-danielwa@cisco.com/","date":"2021-04-16T04:09:15","name":"[4/8] CMDLINE: mips: convert to generic builtin command line","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210416040924.2882771-5-danielwa@cisco.com/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=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=igPWng3g;\n\tdkim-atps=neutral","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=igPWng3g;\n\tdkim-atps=neutral","lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=cisco.com (client-ip=173.37.86.72; helo=rcdn-iport-1.cisco.com;\n envelope-from=danielwa@cisco.com; receiver=)","lists.ozlabs.org; dkim=pass (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=igPWng3g; dkim-atps=neutral"],"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 4F8xzM5GT9z9sVm\n\tfor ; Wed, 31 Mar 2021 04:59:27 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4F8xzM4SKxz3d6J\n\tfor ; Wed, 31 Mar 2021 04:59:27 +1100 (AEDT)","from rcdn-iport-1.cisco.com (rcdn-iport-1.cisco.com [173.37.86.72])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n bits)) (No client certificate requested)\n by lists.ozlabs.org (Postfix) with ESMTPS id 4F8xwt5SbSz3bqm\n for ; Wed, 31 Mar 2021 04:57:18 +1100 (AEDT)","from rcdn-core-2.cisco.com ([173.37.93.153])\n by rcdn-iport-1.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA;\n 30 Mar 2021 17:57:17 +0000","from zorba.cisco.com ([10.24.8.123])\n by rcdn-core-2.cisco.com (8.15.2/8.15.2) with ESMTP id 12UHv6CI024502;\n Tue, 30 Mar 2021 17:57:16 GMT"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n d=cisco.com; i=@cisco.com; l=31637; q=dns/txt;\n s=iport; t=1617127038; x=1618336638;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=xjwCQ5P9bZZohvZETFcBmvRuV24kIqsHd6Gw1Nlfczk=;\n b=igPWng3g7cWQNiADa5Mv3z5CTY/zu6FqNfBonY5kmZDYQ0emverMnYf8\n Aus5H6s0s7OBamsefhgNh/ZWaftdNRgtAnWjkcYrG8q9R6rN0P7NiTZaT\n 4e0jwMoIWFbk3O0fn2GeE2VHzO81bYkbqJ/mMK4QHwOIAE5wYzv9Hod8h 4=;","X-IronPort-AV":"E=Sophos;i=\"5.81,291,1610409600\"; d=\"scan'208\";a=\"869756239\"","From":"Daniel Walker ","To":"Will Deacon ,\n Christophe Leroy ,\n ob Herring ,\n Daniel Gimpelevich ,\n Andrew Morton , x86@kernel.org,\n linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,\n Thomas Bogendoerfer ,\n Florian Fainelli ,\n bcm-kernel-feedback-list@broadcom.com","Subject":"[PATCH 5/8] CMDLINE: mips: convert to generic builtin command line","Date":"Tue, 30 Mar 2021 10:57:00 -0700","Message-Id":"\n ","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"\n <41021d66db2ab427c14255d2a24bb4517c8b58fd.1617126961.git.danielwa@cisco.com>","References":"\n <41021d66db2ab427c14255d2a24bb4517c8b58fd.1617126961.git.danielwa@cisco.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Auto-Response-Suppress":"DR, OOF, AutoReply","X-Outbound-SMTP-Client":"10.24.8.123, [10.24.8.123]","X-Outbound-Node":"rcdn-core-2.cisco.com","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":"Ruslan Ruslichenko ,\n Ruslan Bilovol , linux-kernel@vger.kernel.org,\n linux-arm-kernel@lists.infradead.org, xe-linux-external@cisco.com","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n "},"content":"This updates the mips code to use the CONFIG_GENERIC_CMDLINE\noption.\n\nThis deletes the option for MIPS_CMDLINE_BUILTIN_EXTEND\nand replaces the functionality with generic code.\n\nThis includes a scripted mass convert of the config files to use\nthe new generic cmdline. There is a bit of a trim effect here.\nIt would seems that some of the config haven't been trimmed in\na while.\n\nThe script used is as follows,\n\nif [[ -z \"$1\" || -z \"$2\" ]]; then\n echo \"Two arguments are needed.\"\n exit 1\nfi\nmkdir $1\ncp $2 $1/.config\nsed -i 's/CONFIG_CMDLINE=/CONFIG_CMDLINE_BOOL=y\\nCONFIG_CMDLINE_PREPEND=/g' $1/.config\nmake ARCH=$1 O=$1 olddefconfig\nmake ARCH=$1 O=$1 savedefconfig\ncp $1/defconfig $2\nrm -Rf $1\n\nCc: xe-linux-external@cisco.com\nSigned-off-by: Ruslan Ruslichenko \nSigned-off-by: Ruslan Bilovol \nSigned-off-by: Daniel Walker \n---\n arch/mips/Kconfig | 4 +--\n arch/mips/Kconfig.debug | 44 --------------------------\n arch/mips/configs/ar7_defconfig | 9 ++----\n arch/mips/configs/bcm47xx_defconfig | 8 ++---\n arch/mips/configs/bcm63xx_defconfig | 15 +++------\n arch/mips/configs/bmips_be_defconfig | 11 +++----\n arch/mips/configs/bmips_stb_defconfig | 11 +++----\n arch/mips/configs/capcella_defconfig | 11 ++-----\n arch/mips/configs/ci20_defconfig | 10 +++---\n arch/mips/configs/cu1000-neo_defconfig | 10 +++---\n arch/mips/configs/cu1830-neo_defconfig | 10 +++---\n arch/mips/configs/e55_defconfig | 4 +--\n arch/mips/configs/generic_defconfig | 6 ++--\n arch/mips/configs/gpr_defconfig | 18 ++---------\n arch/mips/configs/loongson3_defconfig | 13 ++------\n arch/mips/configs/mpc30x_defconfig | 7 ++--\n arch/mips/configs/tb0219_defconfig | 7 ++--\n arch/mips/configs/tb0226_defconfig | 7 ++--\n arch/mips/configs/tb0287_defconfig | 7 ++--\n arch/mips/configs/workpad_defconfig | 11 +++----\n arch/mips/kernel/setup.c | 36 +++------------------\n 21 files changed, 59 insertions(+), 200 deletions(-)","diff":"diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig\nindex d89efba3d8a4..0e753894d28d 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\n@@ -3212,9 +3213,6 @@ choice\n \tconfig MIPS_CMDLINE_FROM_BOOTLOADER\n \t\tbool \"Bootloader kernel arguments if available\"\n \n-\tconfig MIPS_CMDLINE_BUILTIN_EXTEND\n-\t\tdepends on CMDLINE_BOOL\n-\t\tbool \"Extend builtin kernel arguments with bootloader arguments\"\n endchoice\n \n endmenu\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..c09470aa672f 100644\n--- a/arch/mips/configs/ar7_defconfig\n+++ b/arch/mips/configs/ar7_defconfig\n@@ -12,6 +12,8 @@ CONFIG_EXPERT=y\n # CONFIG_VM_EVENT_COUNTERS is not set\n # CONFIG_COMPAT_BRK is not set\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"rootfstype=squashfs,jffs2\"\n CONFIG_AR7=y\n CONFIG_HZ_100=y\n CONFIG_KEXEC=y\n@@ -32,9 +34,6 @@ CONFIG_IP_ROUTE_MULTIPATH=y\n CONFIG_IP_ROUTE_VERBOSE=y\n CONFIG_IP_MROUTE=y\n CONFIG_SYN_COOKIES=y\n-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set\n-# CONFIG_INET_XFRM_MODE_TUNNEL is not set\n-# CONFIG_INET_XFRM_MODE_BEET is not set\n # CONFIG_INET_DIAG is not set\n CONFIG_TCP_CONG_ADVANCED=y\n # CONFIG_TCP_CONG_BIC is not set\n@@ -43,7 +42,6 @@ CONFIG_TCP_CONG_WESTWOOD=y\n # CONFIG_TCP_CONG_HTCP is not set\n # CONFIG_IPV6 is not set\n CONFIG_NETFILTER=y\n-# CONFIG_BRIDGE_NETFILTER is not set\n CONFIG_NF_CONNTRACK=m\n CONFIG_NF_CONNTRACK_MARK=y\n CONFIG_NF_CONNTRACK_FTP=m\n@@ -117,8 +115,5 @@ CONFIG_JFFS2_SUMMARY=y\n CONFIG_JFFS2_COMPRESSION_OPTIONS=y\n CONFIG_SQUASHFS=y\n # CONFIG_CRYPTO_HW is not set\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..69a965bb2dd9 100644\n--- a/arch/mips/configs/bcm47xx_defconfig\n+++ b/arch/mips/configs/bcm47xx_defconfig\n@@ -4,8 +4,9 @@ CONFIG_BLK_DEV_INITRD=y\n CONFIG_CC_OPTIMIZE_FOR_SIZE=y\n CONFIG_EMBEDDED=y\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"console=ttyS0,115200\"\n CONFIG_BCM47XX=y\n-CONFIG_PCI=y\n # CONFIG_SUSPEND is not set\n CONFIG_MODULES=y\n CONFIG_MODULE_UNLOAD=y\n@@ -32,6 +33,7 @@ CONFIG_NET_SCH_FQ_CODEL=y\n CONFIG_HAMRADIO=y\n CONFIG_CFG80211=y\n CONFIG_MAC80211=y\n+CONFIG_PCI=y\n CONFIG_MTD=y\n CONFIG_MTD_BCM47XX_PARTS=y\n CONFIG_MTD_BLOCK=y\n@@ -75,7 +77,5 @@ CONFIG_PRINTK_TIME=y\n CONFIG_DEBUG_INFO=y\n 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\"\n+CONFIG_DEBUG_FS=y\ndiff --git a/arch/mips/configs/bcm63xx_defconfig b/arch/mips/configs/bcm63xx_defconfig\nindex 861f680184b9..6791e48b2d7d 100644\n--- a/arch/mips/configs/bcm63xx_defconfig\n+++ b/arch/mips/configs/bcm63xx_defconfig\n@@ -11,27 +11,26 @@ CONFIG_EXPERT=y\n # CONFIG_AIO is not set\n # CONFIG_VM_EVENT_COUNTERS is not set\n # CONFIG_SLUB_DEBUG is not set\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"console=ttyS0,115200\"\n CONFIG_BCM63XX=y\n CONFIG_BCM63XX_CPU_6338=y\n CONFIG_BCM63XX_CPU_6345=y\n CONFIG_BCM63XX_CPU_6348=y\n CONFIG_BCM63XX_CPU_6358=y\n # CONFIG_SECCOMP is not set\n-CONFIG_PCI=y\n-CONFIG_PCCARD=y\n-CONFIG_PCMCIA_BCM63XX=y\n # CONFIG_BLK_DEV_BSG is not set\n CONFIG_NET=y\n CONFIG_UNIX=y\n CONFIG_INET=y\n-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set\n-# CONFIG_INET_XFRM_MODE_TUNNEL is not set\n-# CONFIG_INET_XFRM_MODE_BEET is not set\n # CONFIG_INET_DIAG is not set\n # CONFIG_IPV6 is not set\n CONFIG_CFG80211=y\n CONFIG_NL80211_TESTMODE=y\n CONFIG_MAC80211=y\n+CONFIG_PCI=y\n+CONFIG_PCCARD=y\n+CONFIG_PCMCIA_BCM63XX=y\n # CONFIG_STANDALONE is not set\n # CONFIG_PREVENT_FIRMWARE_BUILD is not set\n CONFIG_MTD=y\n@@ -50,8 +49,6 @@ CONFIG_B43=y\n # CONFIG_SERIO is not set\n # CONFIG_VT is not set\n # CONFIG_UNIX98_PTYS is not set\n-CONFIG_SERIAL_BCM63XX=y\n-CONFIG_SERIAL_BCM63XX_CONSOLE=y\n # CONFIG_HW_RANDOM is not set\n # CONFIG_HWMON is not set\n # CONFIG_VGA_ARB is not set\n@@ -65,5 +62,3 @@ 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..ae1c4adf8d98 100644\n--- a/arch/mips/configs/bmips_be_defconfig\n+++ b/arch/mips/configs/bmips_be_defconfig\n@@ -5,21 +5,20 @@ CONFIG_BLK_DEV_INITRD=y\n CONFIG_EXPERT=y\n # CONFIG_VM_EVENT_COUNTERS is not set\n # CONFIG_SLUB_DEBUG is not set\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"earlycon\"\n CONFIG_BMIPS_GENERIC=y\n CONFIG_HIGHMEM=y\n CONFIG_SMP=y\n CONFIG_NR_CPUS=4\n-# CONFIG_SECCOMP is not set\n CONFIG_MIPS_O32_FP64_SUPPORT=y\n+# CONFIG_SECCOMP is not set\n # CONFIG_BLK_DEV_BSG is not set\n CONFIG_NET=y\n CONFIG_PACKET=y\n CONFIG_PACKET_DIAG=y\n CONFIG_UNIX=y\n CONFIG_INET=y\n-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set\n-# CONFIG_INET_XFRM_MODE_TUNNEL is not set\n-# CONFIG_INET_XFRM_MODE_BEET is not set\n # CONFIG_INET_DIAG is not set\n CONFIG_CFG80211=y\n CONFIG_NL80211_TESTMODE=y\n@@ -73,7 +72,5 @@ CONFIG_NLS_ASCII=y\n CONFIG_NLS_ISO8859_1=y\n # CONFIG_CRYPTO_HW is not set\n CONFIG_PRINTK_TIME=y\n-CONFIG_DEBUG_FS=y\n CONFIG_MAGIC_SYSRQ=y\n-CONFIG_CMDLINE_BOOL=y\n-CONFIG_CMDLINE=\"earlycon\"\n+CONFIG_DEBUG_FS=y\ndiff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig\nindex 625bd2d7e685..cb3b114b10d0 100644\n--- a/arch/mips/configs/bmips_stb_defconfig\n+++ b/arch/mips/configs/bmips_stb_defconfig\n@@ -5,12 +5,13 @@ CONFIG_BLK_DEV_INITRD=y\n CONFIG_EXPERT=y\n # CONFIG_VM_EVENT_COUNTERS is not set\n # CONFIG_SLUB_DEBUG is not set\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"earlycon\"\n CONFIG_BMIPS_GENERIC=y\n CONFIG_CPU_LITTLE_ENDIAN=y\n CONFIG_HIGHMEM=y\n CONFIG_SMP=y\n CONFIG_NR_CPUS=4\n-# CONFIG_SECCOMP is not set\n CONFIG_MIPS_O32_FP64_SUPPORT=y\n CONFIG_CPU_FREQ=y\n CONFIG_CPU_FREQ_STAT=y\n@@ -20,15 +21,13 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y\n CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y\n CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y\n CONFIG_BMIPS_CPUFREQ=y\n+# CONFIG_SECCOMP is not set\n # CONFIG_BLK_DEV_BSG is not set\n CONFIG_NET=y\n CONFIG_PACKET=y\n CONFIG_PACKET_DIAG=y\n CONFIG_UNIX=y\n CONFIG_INET=y\n-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set\n-# CONFIG_INET_XFRM_MODE_TUNNEL is not set\n-# CONFIG_INET_XFRM_MODE_BEET is not set\n # CONFIG_INET_DIAG is not set\n CONFIG_CFG80211=y\n CONFIG_NL80211_TESTMODE=y\n@@ -84,7 +83,5 @@ CONFIG_NLS_ASCII=y\n CONFIG_NLS_ISO8859_1=y\n # CONFIG_CRYPTO_HW is not set\n CONFIG_PRINTK_TIME=y\n-CONFIG_DEBUG_FS=y\n CONFIG_MAGIC_SYSRQ=y\n-CONFIG_CMDLINE_BOOL=y\n-CONFIG_CMDLINE=\"earlycon\"\n+CONFIG_DEBUG_FS=y\ndiff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig\nindex 7bf8971af53b..a8b87cccfade 100644\n--- a/arch/mips/configs/capcella_defconfig\n+++ b/arch/mips/configs/capcella_defconfig\n@@ -2,6 +2,8 @@ CONFIG_SYSVIPC=y\n CONFIG_LOG_BUF_SHIFT=14\n CONFIG_EXPERT=y\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"mem=32M console=ttyVR0,38400\"\n CONFIG_MACH_VR41XX=y\n CONFIG_ZAO_CAPCELLA=y\n CONFIG_MODULES=y\n@@ -20,9 +22,6 @@ CONFIG_INET=y\n CONFIG_IP_MULTICAST=y\n CONFIG_IP_PNP=y\n CONFIG_IP_PNP_BOOTP=y\n-CONFIG_INET_XFRM_MODE_TRANSPORT=m\n-CONFIG_INET_XFRM_MODE_TUNNEL=m\n-CONFIG_INET_XFRM_MODE_BEET=m\n CONFIG_TCP_MD5SIG=y\n # CONFIG_IPV6 is not set\n CONFIG_NETWORK_SECMARK=y\n@@ -73,19 +72,13 @@ CONFIG_CRYPTO_MICHAEL_MIC=m\n CONFIG_CRYPTO_SHA512=m\n CONFIG_CRYPTO_TGR192=m\n CONFIG_CRYPTO_WP512=m\n-CONFIG_CRYPTO_ANUBIS=m\n-CONFIG_CRYPTO_ARC4=m\n CONFIG_CRYPTO_BLOWFISH=m\n CONFIG_CRYPTO_CAMELLIA=m\n CONFIG_CRYPTO_CAST5=m\n CONFIG_CRYPTO_CAST6=m\n CONFIG_CRYPTO_DES=m\n CONFIG_CRYPTO_FCRYPT=m\n-CONFIG_CRYPTO_KHAZAD=m\n CONFIG_CRYPTO_SERPENT=m\n-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..28e72ae87ca9 100644\n--- a/arch/mips/configs/ci20_defconfig\n+++ b/arch/mips/configs/ci20_defconfig\n@@ -22,12 +22,14 @@ CONFIG_EMBEDDED=y\n # CONFIG_VM_EVENT_COUNTERS is not set\n # CONFIG_COMPAT_BRK is not set\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"earlycon console=ttyS4,115200 clk_ignore_unused\"\n CONFIG_MACH_INGENIC_SOC=y\n CONFIG_JZ4780_CI20=y\n CONFIG_HIGHMEM=y\n CONFIG_HZ_100=y\n-# CONFIG_SECCOMP is not set\n # CONFIG_SUSPEND is not set\n+# CONFIG_SECCOMP is not set\n CONFIG_MODULES=y\n # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set\n # CONFIG_COMPACTION is not set\n@@ -99,12 +101,12 @@ CONFIG_IR_GPIO_CIR=m\n CONFIG_IR_GPIO_TX=m\n CONFIG_MEDIA_SUPPORT=m\n # CONFIG_VGA_CONSOLE is not set\n-# CONFIG_HID is not set\n CONFIG_USB=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_SERIAL=y\n CONFIG_USB_SERIAL_CH341=y\n+CONFIG_JZ4770_PHY=y\n CONFIG_USB_GADGET=y\n CONFIG_MMC=y\n CONFIG_MMC_JZ4740=y\n@@ -138,7 +140,6 @@ CONFIG_JZ4780_NEMC=y\n CONFIG_PWM=y\n CONFIG_PWM_JZ4740=m\n CONFIG_JZ4780_EFUSE=y\n-CONFIG_JZ4770_PHY=y\n CONFIG_EXT4_FS=y\n # CONFIG_DNOTIFY is not set\n CONFIG_AUTOFS_FS=y\n@@ -151,7 +152,6 @@ CONFIG_CONFIGFS_FS=y\n CONFIG_UBIFS_FS=y\n CONFIG_NFS_FS=y\n CONFIG_ROOT_NFS=y\n-CONFIG_NLS=y\n CONFIG_NLS_CODEPAGE_437=y\n CONFIG_NLS_CODEPAGE_737=y\n CONFIG_NLS_CODEPAGE_775=y\n@@ -203,5 +203,3 @@ 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..e54e708783d9 100644\n--- a/arch/mips/configs/cu1000-neo_defconfig\n+++ b/arch/mips/configs/cu1000-neo_defconfig\n@@ -19,12 +19,14 @@ CONFIG_EMBEDDED=y\n # CONFIG_VM_EVENT_COUNTERS is not set\n # CONFIG_COMPAT_BRK is not set\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"earlycon clk_ignore_unused\"\n CONFIG_MACH_INGENIC_SOC=y\n CONFIG_X1000_CU1000_NEO=y\n CONFIG_HIGHMEM=y\n CONFIG_HZ_100=y\n-# CONFIG_SECCOMP is not set\n # CONFIG_SUSPEND is not set\n+# CONFIG_SECCOMP is not set\n CONFIG_MODULES=y\n # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set\n # CONFIG_COMPACTION is not set\n@@ -67,12 +69,12 @@ CONFIG_SENSORS_ADS7828=m\n CONFIG_WATCHDOG=y\n CONFIG_JZ4740_WDT=y\n # CONFIG_VGA_CONSOLE is not set\n-# CONFIG_HID is not set\n CONFIG_USB=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_SERIAL=y\n CONFIG_USB_SERIAL_CH341=y\n+CONFIG_JZ4770_PHY=y\n CONFIG_USB_GADGET=y\n CONFIG_MMC=y\n CONFIG_MMC_JZ4740=y\n@@ -87,7 +89,6 @@ CONFIG_DMA_JZ4780=y\n # CONFIG_INGENIC_TIMER is not set\n CONFIG_INGENIC_SYSOST=y\n # CONFIG_IOMMU_SUPPORT is not set\n-CONFIG_JZ4770_PHY=y\n CONFIG_EXT4_FS=y\n # CONFIG_DNOTIFY is not set\n CONFIG_AUTOFS_FS=y\n@@ -98,7 +99,6 @@ CONFIG_PROC_KCORE=y\n CONFIG_TMPFS=y\n CONFIG_CONFIGFS_FS=y\n CONFIG_NFS_FS=y\n-CONFIG_NLS=y\n CONFIG_NLS_CODEPAGE_437=y\n CONFIG_NLS_CODEPAGE_936=y\n CONFIG_NLS_CODEPAGE_950=y\n@@ -123,5 +123,3 @@ 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..06267749acc9 100644\n--- a/arch/mips/configs/cu1830-neo_defconfig\n+++ b/arch/mips/configs/cu1830-neo_defconfig\n@@ -19,12 +19,14 @@ CONFIG_EMBEDDED=y\n # CONFIG_VM_EVENT_COUNTERS is not set\n # CONFIG_COMPAT_BRK is not set\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"earlycon clk_ignore_unused\"\n CONFIG_MACH_INGENIC_SOC=y\n CONFIG_X1830_CU1830_NEO=y\n CONFIG_HIGHMEM=y\n CONFIG_HZ_100=y\n-# CONFIG_SECCOMP is not set\n # CONFIG_SUSPEND is not set\n+# CONFIG_SECCOMP is not set\n CONFIG_MODULES=y\n # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set\n # CONFIG_COMPACTION is not set\n@@ -70,12 +72,12 @@ CONFIG_SENSORS_ADS7828=m\n CONFIG_WATCHDOG=y\n CONFIG_JZ4740_WDT=y\n # CONFIG_VGA_CONSOLE is not set\n-# CONFIG_HID is not set\n CONFIG_USB=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_SERIAL=y\n CONFIG_USB_SERIAL_CH341=y\n+CONFIG_JZ4770_PHY=y\n CONFIG_USB_GADGET=y\n CONFIG_MMC=y\n CONFIG_MMC_JZ4740=y\n@@ -90,7 +92,6 @@ CONFIG_DMA_JZ4780=y\n # CONFIG_INGENIC_TIMER is not set\n CONFIG_INGENIC_SYSOST=y\n # CONFIG_IOMMU_SUPPORT is not set\n-CONFIG_JZ4770_PHY=y\n CONFIG_EXT4_FS=y\n # CONFIG_DNOTIFY is not set\n CONFIG_AUTOFS_FS=y\n@@ -101,7 +102,6 @@ CONFIG_PROC_KCORE=y\n CONFIG_TMPFS=y\n CONFIG_CONFIGFS_FS=y\n CONFIG_NFS_FS=y\n-CONFIG_NLS=y\n CONFIG_NLS_CODEPAGE_437=y\n CONFIG_NLS_CODEPAGE_936=y\n CONFIG_NLS_CODEPAGE_950=y\n@@ -126,5 +126,3 @@ 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..19769d645fcb 100644\n--- a/arch/mips/configs/e55_defconfig\n+++ b/arch/mips/configs/e55_defconfig\n@@ -2,6 +2,8 @@ CONFIG_SYSVIPC=y\n CONFIG_LOG_BUF_SHIFT=14\n CONFIG_EXPERT=y\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M\"\n CONFIG_MACH_VR41XX=y\n CONFIG_CASIO_E55=y\n CONFIG_MODULES=y\n@@ -33,5 +35,3 @@ 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..665ae8d63ef3 100644\n--- a/arch/mips/configs/generic_defconfig\n+++ b/arch/mips/configs/generic_defconfig\n@@ -3,7 +3,6 @@ CONFIG_NO_HZ_IDLE=y\n CONFIG_IKCONFIG=y\n CONFIG_IKCONFIG_PROC=y\n CONFIG_MEMCG=y\n-CONFIG_MEMCG_SWAP=y\n CONFIG_BLK_CGROUP=y\n CONFIG_CFS_BANDWIDTH=y\n CONFIG_RT_GROUP_SCHED=y\n@@ -21,6 +20,8 @@ CONFIG_USERFAULTFD=y\n CONFIG_EMBEDDED=y\n # CONFIG_SLUB_DEBUG is not set\n # CONFIG_COMPAT_BRK is not set\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"earlycon\"\n CONFIG_CPU_LITTLE_ENDIAN=y\n CONFIG_MIPS_CPS=y\n CONFIG_HIGHMEM=y\n@@ -52,7 +53,6 @@ CONFIG_HID_CHICONY=y\n CONFIG_HID_CYPRESS=y\n CONFIG_HID_EZKEY=y\n CONFIG_HID_KENSINGTON=y\n-CONFIG_HID_LOGITECH=y\n CONFIG_HID_MICROSOFT=y\n CONFIG_HID_MONTEREY=y\n # CONFIG_MIPS_PLATFORM_DEVICES is not set\n@@ -88,5 +88,3 @@ 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..cb642d14dd93 100644\n--- a/arch/mips/configs/gpr_defconfig\n+++ b/arch/mips/configs/gpr_defconfig\n@@ -10,9 +10,10 @@ CONFIG_BLK_DEV_INITRD=y\n CONFIG_EXPERT=y\n CONFIG_SLAB=y\n CONFIG_PROFILING=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"console=ttyS0,115200 root=/dev/nfs rw ip=auto\"\n CONFIG_MIPS_ALCHEMY=y\n CONFIG_MIPS_GPR=y\n-CONFIG_PCI=y\n CONFIG_MODULES=y\n CONFIG_MODULE_UNLOAD=y\n CONFIG_PARTITION_ADVANCED=y\n@@ -29,9 +30,6 @@ CONFIG_IP_ROUTE_VERBOSE=y\n CONFIG_IP_PNP=y\n CONFIG_IP_PNP_BOOTP=y\n CONFIG_SYN_COOKIES=y\n-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set\n-# CONFIG_INET_XFRM_MODE_TUNNEL is not set\n-# CONFIG_INET_XFRM_MODE_BEET is not set\n # CONFIG_IPV6 is not set\n CONFIG_NETWORK_SECMARK=y\n CONFIG_NETFILTER=y\n@@ -49,7 +47,6 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m\n CONFIG_NETFILTER_XT_MATCH_MAC=m\n CONFIG_NETFILTER_XT_MATCH_MARK=m\n CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m\n-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m\n CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m\n CONFIG_NETFILTER_XT_MATCH_QUOTA=m\n CONFIG_NETFILTER_XT_MATCH_REALM=m\n@@ -151,6 +148,7 @@ CONFIG_BAYCOM_SER_HDX=m\n CONFIG_YAM=m\n CONFIG_CFG80211=y\n CONFIG_MAC80211=y\n+CONFIG_PCI=y\n CONFIG_MTD=y\n CONFIG_MTD_BLOCK=y\n CONFIG_MTD_CFI=y\n@@ -225,9 +223,6 @@ CONFIG_HDLC_X25=m\n CONFIG_PCI200SYN=m\n CONFIG_WANXL=m\n CONFIG_FARSYNC=m\n-CONFIG_DSCC4=m\n-CONFIG_DSCC4_PCISYNC=y\n-CONFIG_DSCC4_PCI_RST=y\n CONFIG_LAPBETHER=m\n # CONFIG_INPUT_KEYBOARD is not set\n # CONFIG_INPUT_MOUSE is not set\n@@ -247,7 +242,6 @@ CONFIG_WATCHDOG_NOWAYOUT=y\n CONFIG_SSB=m\n CONFIG_SSB_DRIVER_PCICORE=y\n # CONFIG_VGA_ARB is not set\n-# CONFIG_LCD_CLASS_DEVICE is not set\n CONFIG_BACKLIGHT_CLASS_DEVICE=y\n # CONFIG_VGA_CONSOLE is not set\n CONFIG_USB_HID=m\n@@ -295,16 +289,10 @@ CONFIG_CRYPTO_MICHAEL_MIC=m\n CONFIG_CRYPTO_SHA512=m\n CONFIG_CRYPTO_TGR192=m\n CONFIG_CRYPTO_WP512=m\n-CONFIG_CRYPTO_ANUBIS=m\n CONFIG_CRYPTO_BLOWFISH=m\n CONFIG_CRYPTO_CAST5=m\n CONFIG_CRYPTO_CAST6=m\n-CONFIG_CRYPTO_KHAZAD=m\n CONFIG_CRYPTO_SERPENT=m\n-CONFIG_CRYPTO_TEA=m\n 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..f3b8c64ea379 100644\n--- a/arch/mips/configs/loongson3_defconfig\n+++ b/arch/mips/configs/loongson3_defconfig\n@@ -13,7 +13,6 @@ CONFIG_TASK_DELAY_ACCT=y\n CONFIG_TASK_XACCT=y\n CONFIG_TASK_IO_ACCOUNTING=y\n CONFIG_MEMCG=y\n-CONFIG_MEMCG_SWAP=y\n CONFIG_BLK_CGROUP=y\n CONFIG_CGROUP_PIDS=y\n CONFIG_CGROUP_FREEZER=y\n@@ -28,6 +27,8 @@ CONFIG_RELAY=y\n CONFIG_BLK_DEV_INITRD=y\n CONFIG_EMBEDDED=y\n CONFIG_PERF_EVENTS=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"ieee754=relaxed\"\n CONFIG_MACH_LOONGSON64=y\n CONFIG_CPU_HAS_MSA=y\n CONFIG_NR_CPUS=16\n@@ -39,7 +40,6 @@ CONFIG_MIPS32_O32=y\n CONFIG_MIPS32_N32=y\n CONFIG_VIRTUALIZATION=y\n CONFIG_KVM=m\n-CONFIG_KVM_MIPS_VZ=y\n CONFIG_MODULES=y\n CONFIG_MODULE_FORCE_LOAD=y\n CONFIG_MODULE_UNLOAD=y\n@@ -204,7 +204,6 @@ CONFIG_VIRTIO_NET=m\n # CONFIG_NET_VENDOR_DEC is not set\n # CONFIG_NET_VENDOR_DLINK is not set\n # CONFIG_NET_VENDOR_EMULEX is not set\n-# CONFIG_NET_VENDOR_HP is not set\n # CONFIG_NET_VENDOR_I825XX is not set\n CONFIG_E1000=y\n CONFIG_E1000E=y\n@@ -246,7 +245,6 @@ CONFIG_PPP_ASYNC=m\n CONFIG_PPP_SYNC_TTY=m\n CONFIG_ATH9K=m\n CONFIG_HOSTAP=m\n-CONFIG_INPUT_POLLDEV=m\n CONFIG_INPUT_SPARSEKMAP=y\n CONFIG_INPUT_MOUSEDEV=y\n CONFIG_INPUT_MOUSEDEV_PSAUX=y\n@@ -278,7 +276,6 @@ CONFIG_SENSORS_LM75=m\n CONFIG_SENSORS_LM93=m\n CONFIG_SENSORS_W83627HF=m\n CONFIG_MEDIA_SUPPORT=m\n-CONFIG_MEDIA_CAMERA_SUPPORT=y\n CONFIG_MEDIA_USB_SUPPORT=y\n CONFIG_USB_VIDEO_CLASS=m\n CONFIG_DRM=y\n@@ -388,18 +385,14 @@ CONFIG_SECURITY_SELINUX=y\n CONFIG_SECURITY_SELINUX_BOOTPARAM=y\n CONFIG_SECURITY_SELINUX_DISABLE=y\n CONFIG_DEFAULT_SECURITY_DAC=y\n-CONFIG_CRYPTO_AUTHENC=m\n CONFIG_CRYPTO_HMAC=y\n CONFIG_CRYPTO_MD5=y\n CONFIG_CRYPTO_TGR192=m\n CONFIG_CRYPTO_WP512=m\n-CONFIG_CRYPTO_ANUBIS=m\n CONFIG_CRYPTO_BLOWFISH=m\n CONFIG_CRYPTO_CAST5=m\n CONFIG_CRYPTO_CAST6=m\n-CONFIG_CRYPTO_KHAZAD=m\n CONFIG_CRYPTO_SERPENT=m\n-CONFIG_CRYPTO_TEA=m\n CONFIG_CRYPTO_TWOFISH=m\n CONFIG_CRYPTO_DEFLATE=m\n CONFIG_PRINTK_TIME=y\n@@ -408,5 +401,3 @@ 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..925e71b9a9a7 100644\n--- a/arch/mips/configs/mpc30x_defconfig\n+++ b/arch/mips/configs/mpc30x_defconfig\n@@ -3,6 +3,8 @@ CONFIG_LOG_BUF_SHIFT=14\n CONFIG_RELAY=y\n CONFIG_EXPERT=y\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73\"\n CONFIG_MACH_VR41XX=y\n CONFIG_VICTOR_MPC30X=y\n CONFIG_MODULES=y\n@@ -18,9 +20,6 @@ CONFIG_NET_KEY=y\n CONFIG_NET_KEY_MIGRATE=y\n CONFIG_INET=y\n CONFIG_IP_MULTICAST=y\n-CONFIG_INET_XFRM_MODE_TRANSPORT=m\n-CONFIG_INET_XFRM_MODE_TUNNEL=m\n-CONFIG_INET_XFRM_MODE_BEET=m\n # CONFIG_IPV6 is not set\n CONFIG_NETWORK_SECMARK=y\n CONFIG_CONNECTOR=m\n@@ -49,5 +48,3 @@ 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/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig\nindex 6547f84750b5..1d1bacd3eb2b 100644\n--- a/arch/mips/configs/tb0219_defconfig\n+++ b/arch/mips/configs/tb0219_defconfig\n@@ -2,6 +2,8 @@ CONFIG_SYSVIPC=y\n CONFIG_LOG_BUF_SHIFT=14\n CONFIG_EXPERT=y\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs\"\n CONFIG_MACH_VR41XX=y\n CONFIG_TANBAC_TB0219=y\n CONFIG_MODULES=y\n@@ -23,9 +25,6 @@ CONFIG_IP_PNP=y\n CONFIG_IP_PNP_BOOTP=y\n CONFIG_NET_IPIP=m\n CONFIG_SYN_COOKIES=y\n-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set\n-# CONFIG_INET_XFRM_MODE_TUNNEL is not set\n-# CONFIG_INET_XFRM_MODE_BEET is not set\n # CONFIG_IPV6 is not set\n CONFIG_NETWORK_SECMARK=y\n CONFIG_BLK_DEV_LOOP=m\n@@ -73,5 +72,3 @@ 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..072ac9fa92a7 100644\n--- a/arch/mips/configs/tb0226_defconfig\n+++ b/arch/mips/configs/tb0226_defconfig\n@@ -2,6 +2,8 @@ CONFIG_SYSVIPC=y\n CONFIG_LOG_BUF_SHIFT=14\n CONFIG_EXPERT=y\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"cca=3 mem=32M console=ttyVR0,115200\"\n CONFIG_MACH_VR41XX=y\n CONFIG_TANBAC_TB0226=y\n CONFIG_MODULES=y\n@@ -21,9 +23,6 @@ CONFIG_IP_ROUTE_VERBOSE=y\n CONFIG_IP_PNP=y\n CONFIG_IP_PNP_BOOTP=y\n CONFIG_SYN_COOKIES=y\n-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set\n-# CONFIG_INET_XFRM_MODE_TUNNEL is not set\n-# CONFIG_INET_XFRM_MODE_BEET is not set\n # CONFIG_IPV6 is not set\n CONFIG_NETWORK_SECMARK=y\n CONFIG_BLK_DEV_LOOP=m\n@@ -68,5 +67,3 @@ 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..30b1b84fe46b 100644\n--- a/arch/mips/configs/tb0287_defconfig\n+++ b/arch/mips/configs/tb0287_defconfig\n@@ -2,6 +2,8 @@ CONFIG_SYSVIPC=y\n CONFIG_LOG_BUF_SHIFT=14\n CONFIG_EXPERT=y\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs\"\n CONFIG_MACH_VR41XX=y\n CONFIG_MODULES=y\n CONFIG_MODULE_UNLOAD=y\n@@ -22,9 +24,6 @@ CONFIG_IP_PNP=y\n CONFIG_IP_PNP_BOOTP=y\n CONFIG_NET_IPIP=m\n CONFIG_SYN_COOKIES=y\n-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set\n-# CONFIG_INET_XFRM_MODE_TUNNEL is not set\n-# CONFIG_INET_XFRM_MODE_BEET is not set\n CONFIG_TCP_CONG_ADVANCED=y\n CONFIG_TCP_CONG_BIC=y\n CONFIG_TCP_CONG_CUBIC=m\n@@ -81,5 +80,3 @@ 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..81bf360060a2 100644\n--- a/arch/mips/configs/workpad_defconfig\n+++ b/arch/mips/configs/workpad_defconfig\n@@ -2,10 +2,10 @@ CONFIG_SYSVIPC=y\n CONFIG_LOG_BUF_SHIFT=14\n CONFIG_EXPERT=y\n CONFIG_SLAB=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M\"\n CONFIG_MACH_VR41XX=y\n CONFIG_IBM_WORKPAD=y\n-CONFIG_PCCARD=y\n-CONFIG_PCMCIA_VRC4171=y\n CONFIG_MODULES=y\n CONFIG_MODULE_UNLOAD=y\n CONFIG_MODULE_FORCE_UNLOAD=y\n@@ -20,11 +20,10 @@ CONFIG_NET_KEY=y\n CONFIG_NET_KEY_MIGRATE=y\n CONFIG_INET=y\n CONFIG_IP_MULTICAST=y\n-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set\n-# CONFIG_INET_XFRM_MODE_TUNNEL is not set\n-# CONFIG_INET_XFRM_MODE_BEET is not set\n # CONFIG_IPV6 is not set\n CONFIG_NETWORK_SECMARK=y\n+CONFIG_PCCARD=y\n+CONFIG_PCMCIA_VRC4171=y\n CONFIG_BLK_DEV_RAM=m\n CONFIG_IDE=y\n CONFIG_BLK_DEV_IDECS=m\n@@ -61,5 +60,3 @@ 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/kernel/setup.c b/arch/mips/kernel/setup.c\nindex 279be0153f8b..e4fcd9e5f65c 100644\n--- a/arch/mips/kernel/setup.c\n+++ b/arch/mips/kernel/setup.c\n@@ -23,6 +23,7 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n #include \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,27 +541,7 @@ 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+\tboot_command_line[0] = 0;\n \n #ifdef CONFIG_OF_EARLY_FLATTREE\n \t/*\n@@ -589,12 +564,9 @@ static void __init bootcmdline_init(void)\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 * Use the generic system for builtin prepend and append.\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_add_builtin(boot_command_line, NULL, COMMAND_LINE_SIZE);\n }\n \n /*\n","prefixes":["5/8"]}