Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1449486/?format=api
{ "id": 1449486, "url": "http://patchwork.ozlabs.org/api/patches/1449486/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210309000247.2989531-6-danielwa@cisco.com/", "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": "<20210309000247.2989531-6-danielwa@cisco.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20210309000247.2989531-6-danielwa@cisco.com/", "date": "2021-03-09T00:02:41", "name": "[v2,5/7] mips: convert config files to generic cmdline", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "70e6e9dddfa4cb636d49940ff9c1808d17d2adbb", "submitter": { "id": 67374, "url": "http://patchwork.ozlabs.org/api/people/67374/?format=api", "name": "Daniel Walker (danielwa)", "email": "danielwa@cisco.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210309000247.2989531-6-danielwa@cisco.com/mbox/", "series": [ { "id": 232859, "url": "http://patchwork.ozlabs.org/api/series/232859/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=232859", "date": "2021-03-09T00:02:37", "name": "[v2,1/7] CMDLINE: add generic builtin command line", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/232859/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1449486/comments/", "check": "fail", "checks": "http://patchwork.ozlabs.org/api/patches/1449486/checks/", "tags": {}, "related": [], "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=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=<UNKNOWN>)", "ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=co4IcDqP;\n\tdkim-atps=neutral", "lists.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=co4IcDqP;\n\tdkim-atps=neutral", "lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=cisco.com (client-ip=173.37.142.89;\n helo=alln-iport-2.cisco.com;\n envelope-from=danielwa@cisco.com; receiver=<UNKNOWN>)", "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=co4IcDqP; 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 4Dvb7x3ZMLz9sW5\n\tfor <patchwork-incoming@ozlabs.org>; Tue, 9 Mar 2021 11:05:33 +1100 (AEDT)", "from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4Dvb7x2b9Fz3d2L\n\tfor <patchwork-incoming@ozlabs.org>; Tue, 9 Mar 2021 11:05:33 +1100 (AEDT)", "from alln-iport-2.cisco.com (alln-iport-2.cisco.com [173.37.142.89])\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 4Dvb536Bywz3cYb\n for <linuxppc-dev@lists.ozlabs.org>; Tue, 9 Mar 2021 11:03:03 +1100 (AEDT)", "from alln-core-2.cisco.com ([173.36.13.135])\n by alln-iport-2.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA;\n 09 Mar 2021 00:02:59 +0000", "from zorba.cisco.com ([10.24.7.91])\n by alln-core-2.cisco.com (8.15.2/8.15.2) with ESMTP id 12902mKf014497;\n Tue, 9 Mar 2021 00:02:57 GMT" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=cisco.com; i=@cisco.com; l=25823; q=dns/txt;\n s=iport; t=1615248184; x=1616457784;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=hmUI0hS7HXQ0oGk5pG8QkFIl3rKPR9q8j5F+I/qqySQ=;\n b=co4IcDqP4GYPjaQ2kXUgcvdYF4DXW98FhXGrr3rX7ZysKLJTn2iYULPL\n WvHEFdR2PDuf6qX3EeH13A91VtaYCsIivZlcTMJaVFVUxXUSOvRjO/zoV\n OVAEjJB8EFzrCF8DazaTnQnlsKs1yNIjIXeHZQRlCGdkrgL0OSpdFmQFS g=;", "X-IPAS-Result": "\n A0CjAgDRukZgkIcNJK1iHgEBCxIMhgYBOTGybAsBAQEPNAQBAYRNgXwCJTgTAgMBAQEDAgMBAQEBBQEBAQIBBgQUAQEBAQEBhkWGZRgBRoE+ARKCcIMIrCeCKIkKgUUUgSWIXHSEGByBSUKBEYNYihEiBIJHgQ+TTo0gnAKDCIEfmngPIqNslF2iVYFrIYFZMxoIGxWDJFAZDY44jXMBXCADLzgCBgoBAQMJjyYBAQ", "X-IronPort-Anti-Spam-Filtered": "true", "X-IronPort-AV": "E=Sophos;i=\"5.81,233,1610409600\"; d=\"scan'208\";a=\"681191383\"", "From": "Daniel Walker <danielwa@cisco.com>", "To": "Will Deacon <will@kernel.org>,\n Christophe Leroy <christophe.leroy@csgroup.eu>,\n Rob Herring <robh@kernel.org>,\n Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>,\n Andrew Morton <akpm@linux-foundation.org>, x86@kernel.org,\n linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,\n xe-linux-external@cisco.com, Florian Fainelli <f.fainelli@gmail.com>,\n bcm-kernel-feedback-list@broadcom.com", "Subject": "[PATCH v2 5/7] mips: convert config files to generic cmdline", "Date": "Mon, 8 Mar 2021 16:02:41 -0800", "Message-Id": "<20210309000247.2989531-6-danielwa@cisco.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Auto-Response-Suppress": "DR, OOF, AutoReply", "X-Outbound-SMTP-Client": "10.24.7.91, [10.24.7.91]", "X-Outbound-Node": "alln-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 <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": "Thomas Bogendoerfer <tsbogend@alpha.franken.de>,\n linux-kernel@vger.kernel.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 is 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: Daniel Walker <danielwa@cisco.com>\n---\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 18 files changed, 54 insertions(+), 121 deletions(-)", "diff": "diff --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 9c5fadef38cb..502e50ca48ea 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@@ -37,7 +38,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@@ -202,7 +202,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@@ -244,7 +243,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@@ -276,7 +274,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@@ -386,18 +383,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@@ -406,5 +399,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\"\n", "prefixes": [ "v2", "5/7" ] }