From nobody Wed Feb 11 06:53:03 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B897A153BE3; Mon, 22 Apr 2024 16:41:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713804104; cv=none; b=SKpUVMODrILH9nmAOabsqibj7yGQc83XeKkkWkcqrZRdijfxpQtjTHlX+lk2WUChXjcd1c6yUMmArhA/RaQFMkH+sDVDTWB4aiTTfnGitUOAjO093z0923/Mndt2T9pi6qF7qS9Bp+R5M0STxMqA3mGm49jwXK5dZSLVJFIDPa4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713804104; c=relaxed/simple; bh=NqIy7nf1sAoPqh0OTVgs/yJzIPXNWGrpgiGYO8owuME=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NssyE+mDuLT3/hDdZYPQOffpsmyY63MShljso3pmuKiuwmpdi7Rgvff3Ig4AnSLdnV62xuuMG5tgCQcrULlEY245RYKgnoFeICuzcIsUpZqM81Ns0SW/+WY66htiBwLfDHaqnxMMME4O9r3hO5vWxUpxDQ2vXUYW1J2ydiViDU0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cTKQcXLD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cTKQcXLD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63A67C32783; Mon, 22 Apr 2024 16:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713804104; bh=NqIy7nf1sAoPqh0OTVgs/yJzIPXNWGrpgiGYO8owuME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cTKQcXLDQE9J3x8VKak+jgkINdMoxQdlwcCM8/UR+QiTyn3bsdkRvX+pAP6WJhLzh PkkGVLPJi84dWtvhc3joZOfgVXki0G3/gw2AsAOCqVKyAUrdhIknE8ZkeFc0kN9FiM weoqon4Q2XHknwDoz+vj6l++x/ozfFw9sbK7WTbqKI4QNoNrchOOSJjlISFMxnXxbn yHfrqSArW/dz96gakqVjOfrVpl8SbVVWJh7ntuVPkq5EXHz0J+/7rvjgEmzfSHiTGD q156mdJCRMzjD32aaKmmv3ZclExi2xV4kcSZbfEJHjksmmC4tR4vAA8nur3eFISGXP 6XdIP9th+XZvQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , linux-sh@vger.kernel.org, Masahiro Yamada Subject: [PATCH v2 1/2] sh: Convert the last use of 'optional' property in Kconfig Date: Tue, 23 Apr 2024 01:41:03 +0900 Message-Id: <20240422164104.2869507-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240422164104.2869507-1-masahiroy@kernel.org> References: <20240422164104.2869507-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The 'choice' statement is primarily used to exclusively select one option, but the 'optional' property allows all entries to be disabled. This feature is rarely used. In fact, it is only used in arch/sh/Kconfig because the equivalent outcome can be achieved by inserting one more entry as a place-holder. The 'optional' property support will be removed from Kconfig. This commit replaces the 'optional' property with a dummy option, CMDLINE_FROM_BOOTLOADER, as seen in some other architectures. Note: The 'default CMDLINE_OVERWRITE' statement does not work as intended in combination with 'optional'. If neither CONFIG_CMDLINE_OVERWRITE nor CONFIG_CMDLINE_EXTEND is specified in a defconfig file, both of them are disabled. This is a bug. To maintain the current behavior, I added CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy to those defconfig files. Signed-off-by: Masahiro Yamada Acked-by: John Paul Adrian Glaubitz --- Changes in v2: - Rename CONFIG_CMDLINE_NO_MODIFY to CONFIG_CMDLINE_FROM_BOOTLOADER - Capitalize the first work of the subject arch/sh/Kconfig | 6 +++++- arch/sh/configs/apsh4a3a_defconfig | 1 + arch/sh/configs/apsh4ad0a_defconfig | 1 + arch/sh/configs/edosk7705_defconfig | 1 + arch/sh/configs/hp6xx_defconfig | 1 + arch/sh/configs/landisk_defconfig | 1 + arch/sh/configs/magicpanelr2_defconfig | 1 + arch/sh/configs/rsk7264_defconfig | 1 + arch/sh/configs/rsk7269_defconfig | 1 + arch/sh/configs/se7619_defconfig | 1 + arch/sh/configs/se7705_defconfig | 1 + arch/sh/configs/se7722_defconfig | 1 + arch/sh/configs/se7750_defconfig | 1 + arch/sh/configs/secureedge5410_defconfig | 1 + arch/sh/configs/sh7710voipgw_defconfig | 1 + arch/sh/configs/sh7724_generic_defconfig | 1 + arch/sh/configs/sh7770_generic_defconfig | 1 + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 + arch/sh/configs/sh7785lcr_defconfig | 1 + arch/sh/configs/urquell_defconfig | 1 + 20 files changed, 24 insertions(+), 1 deletion(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 2ad3e29f0ebe..8b64ca76aa4b 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -709,7 +709,6 @@ config ROMIMAGE_MMCIF =20 choice prompt "Kernel command line" - optional default CMDLINE_OVERWRITE help Setting this option allows the kernel command line arguments @@ -727,6 +726,11 @@ config CMDLINE_EXTEND Given string will be concatenated with arguments passed in by a bootloader. =20 +config CMDLINE_FROM_BOOTLOADER + bool "Use bootloader kernel arguments" + help + Uses the command-line options passed by the boot loader. + endchoice =20 config CMDLINE diff --git a/arch/sh/configs/apsh4a3a_defconfig b/arch/sh/configs/apsh4a3a_= defconfig index cc909f347877..9c2644443c4d 100644 --- a/arch/sh/configs/apsh4a3a_defconfig +++ b/arch/sh/configs/apsh4a3a_defconfig @@ -15,6 +15,7 @@ CONFIG_MEMORY_START=3D0x0C000000 CONFIG_FLATMEM_MANUAL=3Dy CONFIG_SH_STORE_QUEUES=3Dy CONFIG_SH_APSH4A3A=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_HIGH_RES_TIMERS=3Dy CONFIG_KEXEC=3Dy CONFIG_PREEMPT=3Dy diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0= a_defconfig index 64558bf60e10..05d21d91f41d 100644 --- a/arch/sh/configs/apsh4ad0a_defconfig +++ b/arch/sh/configs/apsh4ad0a_defconfig @@ -42,6 +42,7 @@ CONFIG_SECCOMP=3Dy CONFIG_PREEMPT=3Dy # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_PM=3Dy CONFIG_PM_DEBUG=3Dy CONFIG_PM=3Dy diff --git a/arch/sh/configs/edosk7705_defconfig b/arch/sh/configs/edosk770= 5_defconfig index 9ee35269bee2..57c79da1ff8e 100644 --- a/arch/sh/configs/edosk7705_defconfig +++ b/arch/sh/configs/edosk7705_defconfig @@ -19,6 +19,7 @@ CONFIG_CPU_SUBTYPE_SH7705=3Dy CONFIG_SH_EDOSK7705=3Dy CONFIG_SH_PCLK_FREQ=3D31250000 +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_INPUT is not set # CONFIG_SERIO is not set diff --git a/arch/sh/configs/hp6xx_defconfig b/arch/sh/configs/hp6xx_defcon= fig index 0c45f2a0f9bd..77e3185f63e4 100644 --- a/arch/sh/configs/hp6xx_defconfig +++ b/arch/sh/configs/hp6xx_defconfig @@ -15,6 +15,7 @@ CONFIG_SH_DMA_API=3Dy CONFIG_HD64461_ENABLER=3Dy CONFIG_PCCARD=3Dy CONFIG_PM=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_APM_EMULATION=3Dy # CONFIG_STANDALONE is not set CONFIG_BLK_DEV_SD=3Dy diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_de= fconfig index 541082090918..0311380160f4 100644 --- a/arch/sh/configs/landisk_defconfig +++ b/arch/sh/configs/landisk_defconfig @@ -15,6 +15,7 @@ CONFIG_KEXEC=3Dy CONFIG_PCI=3Dy CONFIG_PCCARD=3Dy CONFIG_YENTA=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_UNIX=3Dy diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magic= panelr2_defconfig index 52937f9cc2ab..8d443749550e 100644 --- a/arch/sh/configs/magicpanelr2_defconfig +++ b/arch/sh/configs/magicpanelr2_defconfig @@ -22,6 +22,7 @@ CONFIG_SH_PCLK_FREQ=3D24000000 CONFIG_SH_DMA=3Dy CONFIG_SH_DMA_API=3Dy CONFIG_HEARTBEAT=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_UNIX=3Dy diff --git a/arch/sh/configs/rsk7264_defconfig b/arch/sh/configs/rsk7264_de= fconfig index a88cb3b77957..e4ef259425c4 100644 --- a/arch/sh/configs/rsk7264_defconfig +++ b/arch/sh/configs/rsk7264_defconfig @@ -21,6 +21,7 @@ CONFIG_MEMORY_START=3D0x0c000000 CONFIG_FLATMEM_MANUAL=3Dy CONFIG_CPU_BIG_ENDIAN=3Dy CONFIG_SH_RSK=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy # CONFIG_SH_TIMER_MTU2 is not set CONFIG_BINFMT_FLAT=3Dy CONFIG_NET=3Dy diff --git a/arch/sh/configs/rsk7269_defconfig b/arch/sh/configs/rsk7269_de= fconfig index d9a7ce783c9b..e0d1560b2bfd 100644 --- a/arch/sh/configs/rsk7269_defconfig +++ b/arch/sh/configs/rsk7269_defconfig @@ -10,6 +10,7 @@ CONFIG_MEMORY_SIZE=3D0x02000000 CONFIG_FLATMEM_MANUAL=3Dy CONFIG_CPU_BIG_ENDIAN=3Dy CONFIG_SH_RSK=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy # CONFIG_SH_TIMER_MTU2 is not set CONFIG_SH_PCLK_FREQ=3D66700000 CONFIG_BINFMT_FLAT=3Dy diff --git a/arch/sh/configs/se7619_defconfig b/arch/sh/configs/se7619_defc= onfig index 14d0f5ead502..6b25e9713e77 100644 --- a/arch/sh/configs/se7619_defconfig +++ b/arch/sh/configs/se7619_defconfig @@ -14,6 +14,7 @@ CONFIG_FLATMEM_MANUAL=3Dy CONFIG_CPU_BIG_ENDIAN=3Dy CONFIG_SH_7619_SOLUTION_ENGINE=3Dy CONFIG_HZ_100=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_BINFMT_FLAT=3Dy CONFIG_BINFMT_ZFLAT=3Dy # CONFIG_STANDALONE is not set diff --git a/arch/sh/configs/se7705_defconfig b/arch/sh/configs/se7705_defc= onfig index 16a0f72f0822..1752ddc2694a 100644 --- a/arch/sh/configs/se7705_defconfig +++ b/arch/sh/configs/se7705_defconfig @@ -13,6 +13,7 @@ CONFIG_FLATMEM_MANUAL=3Dy # CONFIG_SH_ADC is not set CONFIG_SH_SOLUTION_ENGINE=3Dy CONFIG_HEARTBEAT=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_PREEMPT=3Dy CONFIG_NET=3Dy CONFIG_PACKET=3Dy diff --git a/arch/sh/configs/se7722_defconfig b/arch/sh/configs/se7722_defc= onfig index 09e455817447..5327a2f70980 100644 --- a/arch/sh/configs/se7722_defconfig +++ b/arch/sh/configs/se7722_defconfig @@ -17,6 +17,7 @@ CONFIG_SH_7722_SOLUTION_ENGINE=3Dy CONFIG_NO_HZ=3Dy CONFIG_HIGH_RES_TIMERS=3Dy CONFIG_HEARTBEAT=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_KEXEC=3Dy CONFIG_PREEMPT=3Dy CONFIG_NET=3Dy diff --git a/arch/sh/configs/se7750_defconfig b/arch/sh/configs/se7750_defc= onfig index 5fa6239ae4ea..a1e25d7de8a6 100644 --- a/arch/sh/configs/se7750_defconfig +++ b/arch/sh/configs/se7750_defconfig @@ -15,6 +15,7 @@ CONFIG_FLATMEM_MANUAL=3Dy CONFIG_SH_SOLUTION_ENGINE=3Dy CONFIG_SH_PCLK_FREQ=3D33333333 CONFIG_HEARTBEAT=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_UNIX=3Dy diff --git a/arch/sh/configs/secureedge5410_defconfig b/arch/sh/configs/sec= ureedge5410_defconfig index 120176afe3f6..2f77b60e9540 100644 --- a/arch/sh/configs/secureedge5410_defconfig +++ b/arch/sh/configs/secureedge5410_defconfig @@ -10,6 +10,7 @@ CONFIG_SH_SECUREEDGE5410=3Dy CONFIG_SH_DMA=3Dy CONFIG_SH_DMA_API=3Dy CONFIG_PCI=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_NET=3Dy CONFIG_INET=3Dy # CONFIG_INET_XFRM_MODE_TRANSPORT is not set diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh771= 0voipgw_defconfig index 7f742729df69..99a5d0760532 100644 --- a/arch/sh/configs/sh7710voipgw_defconfig +++ b/arch/sh/configs/sh7710voipgw_defconfig @@ -15,6 +15,7 @@ CONFIG_MEMORY_SIZE=3D0x00800000 CONFIG_FLATMEM_MANUAL=3Dy # CONFIG_SH_ADC is not set CONFIG_SH_PCLK_FREQ=3D32768000 +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_UNIX=3Dy diff --git a/arch/sh/configs/sh7724_generic_defconfig b/arch/sh/configs/sh7= 724_generic_defconfig index cbc9389a89a8..5440bd0ca4ed 100644 --- a/arch/sh/configs/sh7724_generic_defconfig +++ b/arch/sh/configs/sh7724_generic_defconfig @@ -12,6 +12,7 @@ CONFIG_CPU_FREQ=3Dy CONFIG_SH_CPU_FREQ=3Dy CONFIG_KEXEC=3Dy CONFIG_KEXEC_JUMP=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_HIBERNATION=3Dy CONFIG_CPU_IDLE=3Dy # CONFIG_PREVENT_FIRMWARE_BUILD is not set diff --git a/arch/sh/configs/sh7770_generic_defconfig b/arch/sh/configs/sh7= 770_generic_defconfig index ee2357deba0f..4338af8d02d0 100644 --- a/arch/sh/configs/sh7770_generic_defconfig +++ b/arch/sh/configs/sh7770_generic_defconfig @@ -14,6 +14,7 @@ CONFIG_SH_CPU_FREQ=3Dy CONFIG_KEXEC=3Dy CONFIG_KEXEC_JUMP=3Dy CONFIG_PM=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_HIBERNATION=3Dy CONFIG_CPU_IDLE=3Dy # CONFIG_PREVENT_FIRMWARE_BUILD is not set diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh= 7785lcr_32bit_defconfig index 59262f42abe6..44f9b2317f09 100644 --- a/arch/sh/configs/sh7785lcr_32bit_defconfig +++ b/arch/sh/configs/sh7785lcr_32bit_defconfig @@ -32,6 +32,7 @@ CONFIG_PREEMPT=3Dy CONFIG_INTC_USERIMASK=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEBUG=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_PM=3Dy CONFIG_CPU_IDLE=3Dy CONFIG_NET=3Dy diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lc= r_defconfig index 94381f8268ff..aec74b0e7003 100644 --- a/arch/sh/configs/sh7785lcr_defconfig +++ b/arch/sh/configs/sh7785lcr_defconfig @@ -17,6 +17,7 @@ CONFIG_HEARTBEAT=3Dy CONFIG_KEXEC=3Dy CONFIG_PREEMPT=3Dy CONFIG_PCI=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_UNIX=3Dy diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_de= fconfig index 445bb451a5ec..00ef62133b04 100644 --- a/arch/sh/configs/urquell_defconfig +++ b/arch/sh/configs/urquell_defconfig @@ -34,6 +34,7 @@ CONFIG_PCIEPORTBUS=3Dy CONFIG_PCIEASPM_DEBUG=3Dy CONFIG_PCI_DEBUG=3Dy CONFIG_BINFMT_MISC=3Dy +CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy CONFIG_PM=3Dy CONFIG_CPU_IDLE=3Dy CONFIG_NET=3Dy --=20 2.40.1