Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1460185/?format=api
{ "id": 1460185, "url": "http://patchwork.ozlabs.org/api/patches/1460185/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/e51a16e369f6a7dfae948c6de76061f3a061a375.1617126961.git.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": "<e51a16e369f6a7dfae948c6de76061f3a061a375.1617126961.git.danielwa@cisco.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/e51a16e369f6a7dfae948c6de76061f3a061a375.1617126961.git.danielwa@cisco.com/", "date": "2021-03-30T17:56:59", "name": "[4/8] CMDLINE: powerpc: convert to generic builtin command line", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "3733662c005a328f623bfe1d583da8ba58343e7a", "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/e51a16e369f6a7dfae948c6de76061f3a061a375.1617126961.git.danielwa@cisco.com/mbox/", "series": [ { "id": 236583, "url": "http://patchwork.ozlabs.org/api/series/236583/?format=api", "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/1460185/comments/", "check": "warning", "checks": "http://patchwork.ozlabs.org/api/patches/1460185/checks/", "tags": {}, "related": [ { "id": 1449485, "url": "http://patchwork.ozlabs.org/api/patches/1449485/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210309000247.2989531-5-danielwa@cisco.com/", "msgid": "<20210309000247.2989531-5-danielwa@cisco.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20210309000247.2989531-5-danielwa@cisco.com/", "date": "2021-03-09T00:02:40", "name": "[v2,4/7] CMDLINE: powerpc: convert to generic builtin command line", "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210309000247.2989531-5-danielwa@cisco.com/mbox/" } ], "headers": { "Return-Path": "\n <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org;\n receiver=<UNKNOWN>)", "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=L/lgWeCZ;\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=L/lgWeCZ;\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=<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=L/lgWeCZ; dkim-atps=neutral" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4F8xyv2yhvz9sVm\n\tfor <patchwork-incoming@ozlabs.org>; Wed, 31 Mar 2021 04:59:03 +1100 (AEDT)", "from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4F8xyv1f75z3clk\n\tfor <patchwork-incoming@ozlabs.org>; Wed, 31 Mar 2021 04:59:03 +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 4F8xws4Nz0z3bt9\n for <linuxppc-dev@lists.ozlabs.org>; Wed, 31 Mar 2021 04:57:16 +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:13 +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 12UHv6CH024502;\n Tue, 30 Mar 2021 17:57:12 GMT" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=cisco.com; i=@cisco.com; l=17013; q=dns/txt;\n s=iport; t=1617127037; x=1618336637;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=fbawHJnBhKEGjMVjp0rAlppmXWpONeNglEph+sjeWYo=;\n b=L/lgWeCZlIagakX8VuNLtfLRugvghLEcO9VkuepvUyTgfSfevPogRodi\n vFMF8sLaotBBzrGXLoUTpgseWEi5OUPveQaSQU+5GO8vtvgTiHF2T7YrA\n ZRsTI/EPVIweTY3NNyGMQbU2eGhdxINxaEWZUynB3ZubG0+5pcZQrjo77 c=;", "X-IronPort-AV": "E=Sophos;i=\"5.81,291,1610409600\"; d=\"scan'208\";a=\"869756216\"", "From": "Daniel Walker <danielwa@cisco.com>", "To": "Will Deacon <will@kernel.org>,\n Christophe Leroy <christophe.leroy@csgroup.eu>,\n ob 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 Michael Ellerman <mpe@ellerman.id.au>,\n Benjamin Herrenschmidt <benh@kernel.crashing.org>,\n Paul Mackerras <paulus@samba.org>", "Subject": "[PATCH 4/8] CMDLINE: powerpc: convert to generic builtin command line", "Date": "Tue, 30 Mar 2021 10:56:59 -0700", "Message-Id": "\n <e51a16e369f6a7dfae948c6de76061f3a061a375.1617126961.git.danielwa@cisco.com>", "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 <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": "Ruslan Ruslichenko <rruslich@cisco.com>,\n Ruslan Bilovol <rbilovol@cisco.com>, linux-kernel@vger.kernel.org,\n xe-linux-external@cisco.com", "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 updates the powerpc code to use the CONFIG_GENERIC_CMDLINE\noption.\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 bash script used to convert 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 <rruslich@cisco.com>\nSigned-off-by: Ruslan Bilovol <rbilovol@cisco.com>\nSigned-off-by: Daniel Walker <danielwa@cisco.com>\n---\n arch/powerpc/Kconfig | 38 +------------------\n arch/powerpc/configs/44x/fsp2_defconfig | 32 ++++++++--------\n arch/powerpc/configs/44x/iss476-smp_defconfig | 24 ++++++------\n arch/powerpc/configs/44x/warp_defconfig | 17 ++++-----\n arch/powerpc/configs/holly_defconfig | 13 ++++---\n arch/powerpc/configs/mvme5100_defconfig | 23 +++++------\n arch/powerpc/configs/skiroot_defconfig | 12 +++---\n arch/powerpc/configs/storcenter_defconfig | 18 ++++-----\n arch/powerpc/kernel/prom_init.c | 10 +++--\n 9 files changed, 74 insertions(+), 113 deletions(-)", "diff": "diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig\nindex 386ae12d8523..3a19e5b74177 100644\n--- a/arch/powerpc/Kconfig\n+++ b/arch/powerpc/Kconfig\n@@ -167,6 +167,8 @@ config PPC\n \tselect EDAC_SUPPORT\n \tselect GENERIC_ATOMIC64\t\t\tif PPC32\n \tselect GENERIC_CLOCKEVENTS_BROADCAST\tif SMP\n+\tselect GENERIC_CMDLINE\n+\tselect GENERIC_CMDLINE_OF\n \tselect GENERIC_CMOS_UPDATE\n \tselect GENERIC_CPU_AUTOPROBE\n \tselect GENERIC_CPU_VULNERABILITIES\tif PPC_BARRIER_NOSPEC\n@@ -886,42 +888,6 @@ config PPC_DENORMALISATION\n \t Add support for handling denormalisation of single precision\n \t values. Useful for bare metal only. If unsure say Y here.\n \n-config CMDLINE\n-\tstring \"Initial kernel command string\"\n-\tdefault \"\"\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, you can supply\n-\t some command-line options at build time by entering them here. In\n-\t most cases you will need to specify the root device here.\n-\n-choice\n-\tprompt \"Kernel command line type\" if CMDLINE != \"\"\n-\tdefault CMDLINE_FROM_BOOTLOADER\n-\n-config CMDLINE_FROM_BOOTLOADER\n-\tbool \"Use bootloader kernel arguments if available\"\n-\thelp\n-\t Uses the command-line options passed by the boot loader. If\n-\t the boot loader doesn't provide any, the default kernel command\n-\t string provided in CMDLINE will be used.\n-\n-config CMDLINE_EXTEND\n-\tbool \"Extend bootloader kernel arguments\"\n-\thelp\n-\t The command-line arguments provided by the boot loader will be\n-\t appended to the default kernel command string.\n-\n-config CMDLINE_FORCE\n-\tbool \"Always use the default kernel command string\"\n-\thelp\n-\t Always use the default kernel command string, even if the boot\n-\t loader passes other arguments to the kernel.\n-\t This is useful if you cannot or don't want to change the\n-\t command-line options your boot loader passes to the kernel.\n-\n-endchoice\n-\n config EXTRA_TARGETS\n \tstring \"Additional default image types\"\n \thelp\ndiff --git a/arch/powerpc/configs/44x/fsp2_defconfig b/arch/powerpc/configs/44x/fsp2_defconfig\nindex 8da316e61a08..4993db054589 100644\n--- a/arch/powerpc/configs/44x/fsp2_defconfig\n+++ b/arch/powerpc/configs/44x/fsp2_defconfig\n@@ -1,8 +1,6 @@\n-CONFIG_44x=y\n # CONFIG_SWAP is not set\n CONFIG_SYSVIPC=y\n # CONFIG_CROSS_MEMORY_ATTACH is not set\n-# CONFIG_FHANDLE is not set\n CONFIG_NO_HZ=y\n CONFIG_HIGH_RES_TIMERS=y\n CONFIG_IKCONFIG=y\n@@ -13,23 +11,25 @@ CONFIG_BLK_DEV_INITRD=y\n # CONFIG_RD_XZ is not set\n # CONFIG_RD_LZO is not set\n # CONFIG_RD_LZ4 is not set\n+# CONFIG_FHANDLE is not set\n CONFIG_KALLSYMS_ALL=y\n CONFIG_BPF_SYSCALL=y\n CONFIG_EMBEDDED=y\n CONFIG_PROFILING=y\n-CONFIG_MODULES=y\n-CONFIG_MODULE_UNLOAD=y\n-# CONFIG_BLK_DEV_BSG is not set\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"ip=on rw\"\n+CONFIG_44x=y\n CONFIG_PPC_47x=y\n # CONFIG_EBONY is not set\n CONFIG_FSP2=y\n CONFIG_476FPE_ERR46=y\n-CONFIG_SWIOTLB=y\n CONFIG_KEXEC=y\n CONFIG_CRASH_DUMP=y\n-CONFIG_CMDLINE=\"ip=on rw\"\n # CONFIG_SUSPEND is not set\n-# CONFIG_PCI is not set\n+CONFIG_OPROFILE=y\n+CONFIG_MODULES=y\n+CONFIG_MODULE_UNLOAD=y\n+# CONFIG_BLK_DEV_BSG is not set\n CONFIG_NET=y\n CONFIG_PACKET=y\n CONFIG_UNIX=y\n@@ -46,14 +46,12 @@ CONFIG_MTD=y\n CONFIG_MTD_BLOCK=y\n CONFIG_MTD_JEDECPROBE=y\n CONFIG_MTD_CFI_AMDSTD=y\n-CONFIG_MTD_PHYSMAP_OF=y\n CONFIG_BLK_DEV_RAM=y\n CONFIG_BLK_DEV_RAM_SIZE=35000\n # CONFIG_SCSI_PROC_FS is not set\n CONFIG_BLK_DEV_SD=y\n # CONFIG_SCSI_LOWLEVEL is not set\n CONFIG_ATA=y\n-# CONFIG_SATA_PMP is not set\n # CONFIG_ATA_SFF is not set\n CONFIG_NETDEVICES=y\n CONFIG_BONDING=m\n@@ -62,7 +60,6 @@ CONFIG_IBM_EMAC=m\n # CONFIG_SERIO is not set\n # CONFIG_VT is not set\n # CONFIG_LEGACY_PTYS is not set\n-# CONFIG_DEVMEM is not set\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n CONFIG_SERIAL_8250_NR_UARTS=32\n@@ -71,6 +68,7 @@ CONFIG_SERIAL_8250_EXTENDED=y\n CONFIG_SERIAL_8250_SHARE_IRQ=y\n CONFIG_SERIAL_OF_PLATFORM=y\n # CONFIG_HW_RANDOM is not set\n+# CONFIG_DEVMEM is not set\n CONFIG_I2C=y\n CONFIG_I2C_IBM_IIC=y\n CONFIG_PTP_1588_CLOCK=y\n@@ -106,6 +104,12 @@ CONFIG_NFS_V3_ACL=y\n CONFIG_NFS_V4=y\n CONFIG_ROOT_NFS=y\n CONFIG_NLS_DEFAULT=\"n\"\n+CONFIG_CRYPTO_CBC=y\n+CONFIG_CRYPTO_ECB=y\n+CONFIG_CRYPTO_PCBC=y\n+CONFIG_CRYPTO_MD5=y\n+CONFIG_CRYPTO_DES=y\n+# CONFIG_CRYPTO_HW is not set\n CONFIG_XZ_DEC=y\n CONFIG_PRINTK_TIME=y\n CONFIG_MESSAGE_LOGLEVEL_DEFAULT=3\n@@ -113,9 +117,3 @@ CONFIG_DYNAMIC_DEBUG=y\n CONFIG_DEBUG_INFO=y\n CONFIG_MAGIC_SYSRQ=y\n CONFIG_DETECT_HUNG_TASK=y\n-CONFIG_CRYPTO_CBC=y\n-CONFIG_CRYPTO_ECB=y\n-CONFIG_CRYPTO_PCBC=y\n-CONFIG_CRYPTO_MD5=y\n-CONFIG_CRYPTO_DES=y\n-# CONFIG_CRYPTO_HW is not set\ndiff --git a/arch/powerpc/configs/44x/iss476-smp_defconfig b/arch/powerpc/configs/44x/iss476-smp_defconfig\nindex c11e777b2f3d..b8d97061517a 100644\n--- a/arch/powerpc/configs/44x/iss476-smp_defconfig\n+++ b/arch/powerpc/configs/44x/iss476-smp_defconfig\n@@ -1,5 +1,3 @@\n-CONFIG_44x=y\n-CONFIG_SMP=y\n CONFIG_SYSVIPC=y\n CONFIG_POSIX_MQUEUE=y\n CONFIG_LOG_BUF_SHIFT=14\n@@ -7,19 +5,22 @@ CONFIG_BLK_DEV_INITRD=y\n CONFIG_EXPERT=y\n CONFIG_KALLSYMS_ALL=y\n CONFIG_PROFILING=y\n-CONFIG_MODULES=y\n-CONFIG_MODULE_UNLOAD=y\n-# CONFIG_BLK_DEV_BSG is not set\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"root=/dev/issblk0\"\n+CONFIG_44x=y\n+CONFIG_SMP=y\n CONFIG_PPC_47x=y\n # CONFIG_EBONY is not set\n CONFIG_ISS4xx=y\n CONFIG_HZ_100=y\n CONFIG_MATH_EMULATION=y\n CONFIG_IRQ_ALL_CPUS=y\n-CONFIG_CMDLINE=\"root=/dev/issblk0\"\n-# CONFIG_PCI is not set\n CONFIG_ADVANCED_OPTIONS=y\n CONFIG_DYNAMIC_MEMSTART=y\n+CONFIG_OPROFILE=y\n+CONFIG_MODULES=y\n+CONFIG_MODULE_UNLOAD=y\n+# CONFIG_BLK_DEV_BSG is not set\n CONFIG_NET=y\n CONFIG_PACKET=y\n CONFIG_UNIX=y\n@@ -33,7 +34,6 @@ CONFIG_MTD=y\n CONFIG_MTD_BLOCK=y\n CONFIG_MTD_JEDECPROBE=y\n CONFIG_MTD_CFI_AMDSTD=y\n-CONFIG_MTD_PHYSMAP_OF=y\n CONFIG_BLK_DEV_RAM=y\n CONFIG_BLK_DEV_RAM_SIZE=35000\n # CONFIG_INPUT is not set\n@@ -56,13 +56,13 @@ CONFIG_PROC_KCORE=y\n CONFIG_TMPFS=y\n CONFIG_CRAMFS=y\n # CONFIG_NETWORK_FILESYSTEMS is not set\n-CONFIG_DEBUG_INFO=y\n-CONFIG_MAGIC_SYSRQ=y\n-CONFIG_DETECT_HUNG_TASK=y\n-CONFIG_PPC_EARLY_DEBUG=y\n CONFIG_CRYPTO_CBC=y\n CONFIG_CRYPTO_ECB=y\n CONFIG_CRYPTO_PCBC=y\n CONFIG_CRYPTO_MD5=y\n CONFIG_CRYPTO_DES=y\n # CONFIG_CRYPTO_HW is not set\n+CONFIG_DEBUG_INFO=y\n+CONFIG_MAGIC_SYSRQ=y\n+CONFIG_DETECT_HUNG_TASK=y\n+CONFIG_PPC_EARLY_DEBUG=y\ndiff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig\nindex 47252c2d7669..d2e4bbe1492c 100644\n--- a/arch/powerpc/configs/44x/warp_defconfig\n+++ b/arch/powerpc/configs/44x/warp_defconfig\n@@ -1,4 +1,3 @@\n-CONFIG_44x=y\n CONFIG_LOCALVERSION=\"-pika\"\n # CONFIG_LOCALVERSION_AUTO is not set\n CONFIG_SYSVIPC=y\n@@ -7,15 +6,16 @@ CONFIG_IKCONFIG_PROC=y\n CONFIG_LOG_BUF_SHIFT=14\n CONFIG_BLK_DEV_INITRD=y\n CONFIG_EXPERT=y\n-CONFIG_MODULES=y\n-CONFIG_MODULE_UNLOAD=y\n-# CONFIG_BLK_DEV_BSG is not set\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"ip=on\"\n+CONFIG_44x=y\n # CONFIG_EBONY is not set\n CONFIG_WARP=y\n CONFIG_PPC4xx_GPIO=y\n CONFIG_HZ_1000=y\n-CONFIG_CMDLINE=\"ip=on\"\n-# CONFIG_PCI is not set\n+CONFIG_MODULES=y\n+CONFIG_MODULE_UNLOAD=y\n+# CONFIG_BLK_DEV_BSG is not set\n CONFIG_NET=y\n CONFIG_PACKET=y\n CONFIG_UNIX=y\n@@ -31,7 +31,6 @@ CONFIG_MTD_CMDLINE_PARTS=y\n CONFIG_MTD_BLOCK=y\n CONFIG_MTD_CFI=y\n CONFIG_MTD_CFI_AMDSTD=y\n-CONFIG_MTD_PHYSMAP_OF=y\n CONFIG_MTD_RAW_NAND=y\n CONFIG_MTD_NAND_NDFC=y\n CONFIG_MTD_UBI=y\n@@ -88,9 +87,9 @@ CONFIG_NLS_UTF8=y\n CONFIG_CRC_CCITT=y\n CONFIG_CRC_T10DIF=y\n CONFIG_PRINTK_TIME=y\n+# CONFIG_DEBUG_BUGVERBOSE is not set\n CONFIG_DEBUG_INFO=y\n-CONFIG_DEBUG_FS=y\n CONFIG_MAGIC_SYSRQ=y\n+CONFIG_DEBUG_FS=y\n CONFIG_DETECT_HUNG_TASK=y\n # CONFIG_SCHED_DEBUG is not set\n-# CONFIG_DEBUG_BUGVERBOSE is not set\ndiff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig\nindex 271daff47d1d..98c0644e80b4 100644\n--- a/arch/powerpc/configs/holly_defconfig\n+++ b/arch/powerpc/configs/holly_defconfig\n@@ -4,17 +4,18 @@ CONFIG_HIGH_RES_TIMERS=y\n CONFIG_LOG_BUF_SHIFT=14\n CONFIG_BLK_DEV_INITRD=y\n CONFIG_EXPERT=y\n-CONFIG_MODULES=y\n-# CONFIG_BLK_DEV_BSG is not set\n-CONFIG_PARTITION_ADVANCED=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"console=ttyS0,115200\"\n # CONFIG_PPC_CHRP is not set\n # CONFIG_PPC_PMAC is not set\n CONFIG_EMBEDDED6xx=y\n CONFIG_PPC_HOLLY=y\n CONFIG_GEN_RTC=y\n-CONFIG_BINFMT_MISC=y\n-CONFIG_CMDLINE=\"console=ttyS0,115200\"\n # CONFIG_SECCOMP is not set\n+CONFIG_MODULES=y\n+# CONFIG_BLK_DEV_BSG is not set\n+CONFIG_PARTITION_ADVANCED=y\n+CONFIG_BINFMT_MISC=y\n CONFIG_NET=y\n CONFIG_PACKET=y\n CONFIG_UNIX=y\n@@ -53,8 +54,8 @@ CONFIG_PROC_KCORE=y\n CONFIG_TMPFS=y\n CONFIG_NFS_FS=y\n CONFIG_ROOT_NFS=y\n+# CONFIG_DEBUG_BUGVERBOSE is not set\n CONFIG_MAGIC_SYSRQ=y\n # CONFIG_SCHED_DEBUG is not set\n-# CONFIG_DEBUG_BUGVERBOSE is not set\n CONFIG_XMON=y\n CONFIG_XMON_DEFAULT=y\ndiff --git a/arch/powerpc/configs/mvme5100_defconfig b/arch/powerpc/configs/mvme5100_defconfig\nindex 1fed6be95d53..884a3e0defde 100644\n--- a/arch/powerpc/configs/mvme5100_defconfig\n+++ b/arch/powerpc/configs/mvme5100_defconfig\n@@ -11,16 +11,17 @@ CONFIG_LOG_BUF_SHIFT=14\n # CONFIG_NET_NS is not set\n CONFIG_CC_OPTIMIZE_FOR_SIZE=y\n # CONFIG_COMPAT_BRK is not set\n-CONFIG_MODULES=y\n-CONFIG_MODULE_UNLOAD=y\n-# CONFIG_BLK_DEV_BSG is not set\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"console=ttyS0,9600 ip=dhcp root=/dev/nfs\"\n # CONFIG_PPC_CHRP is not set\n # CONFIG_PPC_PMAC is not set\n CONFIG_EMBEDDED6xx=y\n CONFIG_MVME5100=y\n CONFIG_KVM_GUEST=y\n CONFIG_HZ_100=y\n-CONFIG_CMDLINE=\"console=ttyS0,9600 ip=dhcp root=/dev/nfs\"\n+CONFIG_MODULES=y\n+CONFIG_MODULE_UNLOAD=y\n+# CONFIG_BLK_DEV_BSG is not set\n # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set\n # CONFIG_COMPACTION is not set\n CONFIG_NET=y\n@@ -108,13 +109,6 @@ CONFIG_NLS_CODEPAGE_437=m\n CONFIG_NLS_CODEPAGE_932=m\n CONFIG_NLS_ISO8859_1=m\n CONFIG_NLS_UTF8=m\n-CONFIG_CRC_CCITT=m\n-CONFIG_CRC_T10DIF=y\n-CONFIG_XZ_DEC=y\n-CONFIG_MAGIC_SYSRQ=y\n-CONFIG_DEBUG_KERNEL=y\n-CONFIG_DETECT_HUNG_TASK=y\n-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=20\n CONFIG_CRYPTO_CBC=y\n CONFIG_CRYPTO_PCBC=m\n CONFIG_CRYPTO_MD5=y\n@@ -125,3 +119,10 @@ CONFIG_CRYPTO_DES=y\n CONFIG_CRYPTO_SERPENT=m\n CONFIG_CRYPTO_TWOFISH=m\n CONFIG_CRYPTO_DEFLATE=m\n+CONFIG_CRC_CCITT=m\n+CONFIG_CRC_T10DIF=y\n+CONFIG_XZ_DEC=y\n+CONFIG_MAGIC_SYSRQ=y\n+CONFIG_DEBUG_KERNEL=y\n+CONFIG_DETECT_HUNG_TASK=y\n+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=20\ndiff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig\nindex b806a5d3a695..5e11995508d7 100644\n--- a/arch/powerpc/configs/skiroot_defconfig\n+++ b/arch/powerpc/configs/skiroot_defconfig\n@@ -26,6 +26,8 @@ CONFIG_PERF_EVENTS=y\n # CONFIG_SLAB_MERGE_DEFAULT is not set\n CONFIG_SLAB_FREELIST_RANDOM=y\n CONFIG_SLAB_FREELIST_HARDENED=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"console=tty0 console=hvc0 ipr.fast_reboot=1 quiet\"\n CONFIG_PPC64=y\n CONFIG_ALTIVEC=y\n CONFIG_VSX=y\n@@ -42,14 +44,11 @@ CONFIG_KEXEC=y\n CONFIG_KEXEC_FILE=y\n CONFIG_PRESERVE_FA_DUMP=y\n CONFIG_IRQ_ALL_CPUS=y\n-CONFIG_NUMA=y\n CONFIG_PPC_64K_PAGES=y\n CONFIG_SCHED_SMT=y\n-CONFIG_CMDLINE=\"console=tty0 console=hvc0 ipr.fast_reboot=1 quiet\"\n-# CONFIG_SECCOMP is not set\n # CONFIG_PPC_MEM_KEYS is not set\n CONFIG_JUMP_LABEL=y\n-CONFIG_STRICT_KERNEL_RWX=y\n+# CONFIG_SECCOMP is not set\n CONFIG_MODULES=y\n CONFIG_MODULE_UNLOAD=y\n CONFIG_MODULE_SIG_FORCE=y\n@@ -80,7 +79,6 @@ CONFIG_BLK_DEV_NVME=m\n CONFIG_NVME_MULTIPATH=y\n CONFIG_EEPROM_AT24=m\n # CONFIG_CXL is not set\n-# CONFIG_OCXL is not set\n CONFIG_BLK_DEV_SD=m\n CONFIG_BLK_DEV_SR=m\n CONFIG_CHR_DEV_SG=m\n@@ -199,7 +197,6 @@ CONFIG_PHYLIB=y\n CONFIG_INPUT_EVDEV=y\n CONFIG_INPUT_MISC=y\n # CONFIG_SERIO_SERPORT is not set\n-# CONFIG_DEVMEM is not set\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n CONFIG_IPMI_HANDLER=y\n@@ -207,9 +204,10 @@ CONFIG_IPMI_DEVICE_INTERFACE=y\n CONFIG_IPMI_POWERNV=y\n CONFIG_IPMI_WATCHDOG=y\n CONFIG_HW_RANDOM=y\n+# CONFIG_DEVMEM is not set\n+# CONFIG_DEVPORT is not set\n CONFIG_TCG_TPM=y\n CONFIG_TCG_TIS_I2C_NUVOTON=y\n-# CONFIG_DEVPORT is not set\n CONFIG_I2C=y\n # CONFIG_I2C_COMPAT is not set\n CONFIG_I2C_CHARDEV=y\ndiff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig\nindex 47dcfaddc1ac..17a17b8ae160 100644\n--- a/arch/powerpc/configs/storcenter_defconfig\n+++ b/arch/powerpc/configs/storcenter_defconfig\n@@ -2,18 +2,19 @@ CONFIG_SYSVIPC=y\n CONFIG_LOG_BUF_SHIFT=14\n CONFIG_EXPERT=y\n # CONFIG_KALLSYMS is not set\n-CONFIG_MODULES=y\n-CONFIG_MODULE_UNLOAD=y\n-# CONFIG_BLK_DEV_BSG is not set\n-CONFIG_PARTITION_ADVANCED=y\n+CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE_PREPEND=\"console=ttyS0,115200\"\n # CONFIG_PPC_CHRP is not set\n # CONFIG_PPC_PMAC is not set\n CONFIG_EMBEDDED6xx=y\n CONFIG_STORCENTER=y\n CONFIG_HZ_100=y\n-CONFIG_BINFMT_MISC=y\n-CONFIG_CMDLINE=\"console=ttyS0,115200\"\n # CONFIG_SECCOMP is not set\n+CONFIG_MODULES=y\n+CONFIG_MODULE_UNLOAD=y\n+# CONFIG_BLK_DEV_BSG is not set\n+CONFIG_PARTITION_ADVANCED=y\n+CONFIG_BINFMT_MISC=y\n CONFIG_NET=y\n CONFIG_PACKET=m\n CONFIG_UNIX=y\n@@ -35,7 +36,6 @@ CONFIG_BLK_DEV_SD=y\n CONFIG_BLK_DEV_SR=y\n CONFIG_SCSI_SPI_ATTRS=y\n CONFIG_ATA=y\n-CONFIG_PATA_VIA=y\n CONFIG_MD=y\n CONFIG_BLK_DEV_MD=y\n CONFIG_MD_LINEAR=y\n@@ -44,16 +44,13 @@ CONFIG_MD_RAID1=y\n CONFIG_MD_RAID456=y\n CONFIG_NETDEVICES=y\n CONFIG_DUMMY=m\n-CONFIG_R8169=y\n # CONFIG_INPUT is not set\n # CONFIG_SERIO is not set\n # CONFIG_VT is not set\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n-# CONFIG_SERIAL_8250_PCI is not set\n CONFIG_SERIAL_8250_NR_UARTS=2\n CONFIG_SERIAL_8250_RUNTIME_UARTS=2\n-CONFIG_NVRAM=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_MPC=y\n@@ -76,4 +73,3 @@ CONFIG_NLS_CODEPAGE_437=y\n CONFIG_NLS_ISO8859_1=y\n CONFIG_NLS_UTF8=y\n CONFIG_CRC_T10DIF=y\n-# CONFIG_ENABLE_MUST_CHECK is not set\ndiff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c\nindex 2c2f33155317..27fece82ff93 100644\n--- a/arch/powerpc/kernel/prom_init.c\n+++ b/arch/powerpc/kernel/prom_init.c\n@@ -27,6 +27,7 @@\n #include <linux/initrd.h>\n #include <linux/bitops.h>\n #include <linux/pgtable.h>\n+#include <linux/cmdline.h>\n #include <asm/prom.h>\n #include <asm/rtas.h>\n #include <asm/page.h>\n@@ -309,6 +310,7 @@ static char __init *prom_strstr(const char *s1, const char *s2)\n \treturn NULL;\n }\n \n+#ifdef GENERIC_CMDLINE_NEED_STRLCAT\n static size_t __init prom_strlcat(char *dest, const char *src, size_t count)\n {\n \tsize_t dsize = prom_strlen(dest);\n@@ -328,6 +330,7 @@ static size_t __init prom_strlcat(char *dest, const char *src, size_t count)\n \treturn res;\n \n }\n+#endif\n \n #ifdef CONFIG_PPC_PSERIES\n static int __init prom_strtobool(const char *s, bool *res)\n@@ -780,12 +783,11 @@ static void __init early_cmdline_parse(void)\n \tprom_cmd_line[0] = 0;\n \tp = prom_cmd_line;\n \n-\tif (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && (long)prom.chosen > 0)\n+\tif ((long)prom.chosen > 0)\n \t\tl = prom_getprop(prom.chosen, \"bootargs\", p, COMMAND_LINE_SIZE-1);\n \n-\tif (IS_ENABLED(CONFIG_CMDLINE_EXTEND) || l <= 0 || p[0] == '\\0')\n-\t\tprom_strlcat(prom_cmd_line, \" \" CONFIG_CMDLINE,\n-\t\t\t sizeof(prom_cmd_line));\n+\tcmdline_add_builtin_custom(prom_cmd_line, (l > 0 ? p : NULL), sizeof(prom_cmd_line),\n+\t\t\t\t\t__prombss, prom_strlcpy, prom_strlcat);\n \n \tprom_printf(\"command line: %s\\n\", prom_cmd_line);\n \n", "prefixes": [ "4/8" ] }