{"id":1461765,"url":"http://patchwork.ozlabs.org/api/patches/1461765/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/c73e170d5fbcc3ac5d7bc98a1e0bfa0b899b185e.1617375802.git.christophe.leroy@csgroup.eu/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<c73e170d5fbcc3ac5d7bc98a1e0bfa0b899b185e.1617375802.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/c73e170d5fbcc3ac5d7bc98a1e0bfa0b899b185e.1617375802.git.christophe.leroy@csgroup.eu/","date":"2021-04-02T15:18:12","name":"[v4,11/20] microblaze: Convert to GENERIC_CMDLINE","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"b6685ae31460cb8ac3cab48c13a12b7a984ac06d","submitter":{"id":79086,"url":"http://patchwork.ozlabs.org/api/people/79086/?format=json","name":"Christophe Leroy","email":"christophe.leroy@csgroup.eu"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/c73e170d5fbcc3ac5d7bc98a1e0bfa0b899b185e.1617375802.git.christophe.leroy@csgroup.eu/mbox/","series":[{"id":237158,"url":"http://patchwork.ozlabs.org/api/series/237158/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=237158","date":"2021-04-02T15:18:03","name":"Implement GENERIC_CMDLINE","version":4,"mbox":"http://patchwork.ozlabs.org/series/237158/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1461765/comments/","check":"success","checks":"http://patchwork.ozlabs.org/api/patches/1461765/checks/","tags":{},"related":[{"id":1458806,"url":"http://patchwork.ozlabs.org/api/patches/1458806/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/0ce1c49ba4db6ffad82561d8b2877bd2ecde854d.1616765870.git.christophe.leroy@csgroup.eu/","msgid":"<0ce1c49ba4db6ffad82561d8b2877bd2ecde854d.1616765870.git.christophe.leroy@csgroup.eu>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/0ce1c49ba4db6ffad82561d8b2877bd2ecde854d.1616765870.git.christophe.leroy@csgroup.eu/","date":"2021-03-26T13:44:55","name":"[v3,08/17] microblaze: Convert to GENERIC_CMDLINE","mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/0ce1c49ba4db6ffad82561d8b2877bd2ecde854d.1616765870.git.christophe.leroy@csgroup.eu/mbox/"}],"headers":{"Return-Path":"\n <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=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>)","lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=csgroup.eu (client-ip=93.17.236.30; helo=pegase1.c-s.fr;\n envelope-from=christophe.leroy@csgroup.eu; receiver=<UNKNOWN>)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org\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 4FBkLg02J1z9sRf\n\tfor <patchwork-incoming@ozlabs.org>; Sat,  3 Apr 2021 02:22:18 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4FBkLf62NJz3f0M\n\tfor <patchwork-incoming@ozlabs.org>; Sat,  3 Apr 2021 02:22:18 +1100 (AEDT)","from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by lists.ozlabs.org (Postfix) with ESMTPS id 4FBkG04b9Tz3c0G\n for <linuxppc-dev@lists.ozlabs.org>; Sat,  3 Apr 2021 02:18:16 +1100 (AEDT)","from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4FBkFv5gXmz9v2lw;\n Fri,  2 Apr 2021 17:18:11 +0200 (CEST)","from pegase1.c-s.fr ([192.168.12.234])\n by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024)\n with ESMTP id ZVGa-EQtaQRr; Fri,  2 Apr 2021 17:18:11 +0200 (CEST)","from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192])\n by pegase1.c-s.fr (Postfix) with ESMTP id 4FBkFv4Sv5z9v2ls;\n Fri,  2 Apr 2021 17:18:11 +0200 (CEST)","from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 83CBF8BB7C;\n Fri,  2 Apr 2021 17:18:13 +0200 (CEST)","from messagerie.si.c-s.fr ([127.0.0.1])\n by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023)\n with ESMTP id ePI0pVGy8P5x; Fri,  2 Apr 2021 17:18:13 +0200 (CEST)","from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 2FEB68BB79;\n Fri,  2 Apr 2021 17:18:13 +0200 (CEST)","by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0)\n id F0BE667989; Fri,  2 Apr 2021 15:18:12 +0000 (UTC)"],"X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Message-Id":"\n <c73e170d5fbcc3ac5d7bc98a1e0bfa0b899b185e.1617375802.git.christophe.leroy@csgroup.eu>","In-Reply-To":"<cover.1617375802.git.christophe.leroy@csgroup.eu>","References":"<cover.1617375802.git.christophe.leroy@csgroup.eu>","From":"Christophe Leroy <christophe.leroy@csgroup.eu>","Subject":"[PATCH v4 11/20] microblaze: Convert to GENERIC_CMDLINE","To":"will@kernel.org, danielwa@cisco.com, robh@kernel.org,\n daniel@gimpelevich.san-francisco.ca.us, arnd@kernel.org,\n akpm@linux-foundation.org","Date":"Fri,  2 Apr 2021 15:18:12 +0000 (UTC)","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org>","List-Unsubscribe":"<https://lists.ozlabs.org/options/linuxppc-dev>,\n <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>","List-Archive":"<http://lists.ozlabs.org/pipermail/linuxppc-dev/>","List-Post":"<mailto:linuxppc-dev@lists.ozlabs.org>","List-Help":"<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>","List-Subscribe":"<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>","Cc":"linux-arch@vger.kernel.org, devicetree@vger.kernel.org,\n microblaze <monstr@monstr.eu>, linux-xtensa@linux-xtensa.org,\n linux-sh@vger.kernel.org, linux-hexagon@vger.kernel.org, x86@kernel.org,\n linux-kernel@vger.kernel.org, nios2 <ley.foon.tan@intel.com>,\n linux-mips@vger.kernel.org, linux-mm@kvack.org,\n openrisc@lists.librecores.org,\n sparclinux@vger.kernel.org, linux-riscv@lists.infradead.org,\n linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>"},"content":"This converts the architecture to GENERIC_CMDLINE.\n\nSigned-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>\n---\n arch/microblaze/Kconfig               | 24 +-----------------------\n arch/microblaze/configs/mmu_defconfig |  2 +-\n arch/microblaze/kernel/head.S         |  4 ++--\n 3 files changed, 4 insertions(+), 26 deletions(-)","diff":"diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig\nindex 0660f47012bc..1242f34bc2a2 100644\n--- a/arch/microblaze/Kconfig\n+++ b/arch/microblaze/Kconfig\n@@ -15,6 +15,7 @@ config MICROBLAZE\n \tselect COMMON_CLK\n \tselect DMA_DIRECT_REMAP\n \tselect GENERIC_ATOMIC64\n+\tselect GENERIC_CMDLINE\n \tselect GENERIC_CPU_DEVICES\n \tselect GENERIC_IDLE_POLL_SETUP\n \tselect GENERIC_IRQ_PROBE\n@@ -93,29 +94,6 @@ source \"kernel/Kconfig.hz\"\n config MMU\n \tdef_bool y\n \n-comment \"Boot options\"\n-\n-config CMDLINE_BOOL\n-\tbool \"Default bootloader kernel arguments\"\n-\n-config CMDLINE\n-\tstring \"Default kernel command string\"\n-\tdepends on CMDLINE_BOOL\n-\tdefault \"console=ttyUL0,115200\"\n-\thelp\n-\t  On some architectures there is currently no way for the boot loader\n-\t  to pass arguments to the kernel. For these architectures, you should\n-\t  supply some command-line options at build time by entering them\n-\t  here.\n-\n-config CMDLINE_FORCE\n-\tbool \"Force default kernel command string\"\n-\tdepends on CMDLINE_BOOL\n-\tdefault n\n-\thelp\n-\t  Set this to have arguments from the default kernel command string\n-\t  override those passed by the boot loader.\n-\n endmenu\n \n menu \"Kernel features\"\ndiff --git a/arch/microblaze/configs/mmu_defconfig b/arch/microblaze/configs/mmu_defconfig\nindex 51337fffb947..b4d2219d0a8f 100644\n--- a/arch/microblaze/configs/mmu_defconfig\n+++ b/arch/microblaze/configs/mmu_defconfig\n@@ -16,7 +16,7 @@ CONFIG_XILINX_MICROBLAZE0_USE_DIV=1\n CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2\n CONFIG_XILINX_MICROBLAZE0_USE_FPU=2\n CONFIG_HZ_100=y\n-CONFIG_CMDLINE_BOOL=y\n+CONFIG_CMDLINE=\"console=ttyUL0,115200\"\n CONFIG_CMDLINE_FORCE=y\n CONFIG_HIGHMEM=y\n CONFIG_PCI_XILINX=y\ndiff --git a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S\nindex ec2fcb545e64..605b18c86ac8 100644\n--- a/arch/microblaze/kernel/head.S\n+++ b/arch/microblaze/kernel/head.S\n@@ -105,7 +105,7 @@ _copy_fdt:\n \taddik\tr3, r3, -4 /* descrement loop */\n no_fdt_arg:\n \n-#ifndef CONFIG_CMDLINE_BOOL\n+#if CONFIG_CMDLINE == \"\"\n /*\n  * handling command line\n  * copy command line directly to cmd_line placed in data section.\n@@ -126,7 +126,7 @@ _copy_command_line:\n \taddik\tr5, r4, 0\t\t/* add new space for command line */\n \ttovirt(r5,r5)\n skip:\n-#endif /* CONFIG_CMDLINE_BOOL */\n+#endif /* CONFIG_CMDLINE */\n \n #ifdef NOT_COMPILE\n /* save bram context */\n","prefixes":["v4","11/20"]}