Received: by 2002:ab2:6203:0:b0:1f5:f2ab:c469 with SMTP id o3csp2404151lqt; Mon, 22 Apr 2024 09:43:21 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCW3J0yoKfdqw23wqhfHU0TccXasHAX0Q85OZ02UZoXTAbuJ/Y81sKHPaCPjgm0dohwHg3+1m99/U5GGSaeDDLHZh77JCkrM4c3YWPU0pw== X-Google-Smtp-Source: AGHT+IHQd6PnTAh06sa3repZJRgbCYeyi5YYXwHZsCrXrKrjU/AxL2I+LefihZtultEsbmfgTcKl X-Received: by 2002:a2e:b52f:0:b0:2d8:71d4:4c62 with SMTP id z15-20020a2eb52f000000b002d871d44c62mr5661012ljm.49.1713804201422; Mon, 22 Apr 2024 09:43:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713804201; cv=pass; d=google.com; s=arc-20160816; b=uP/o8YRXTHgj/UMVKIrXYmAF0Dblbj06x/MWUjVDXCGfr+ncTxf1xItuOu6dF4BN3W i2mbOxJ4UqMb6b08jw+IFSNEjiLvodugs/r8HFYtr4A2s8veSRJzZuBST542tJdGq/5V UZp9gAF4CjggFi0mBGdySJCpZwapX5q8soDtQC8MTG8UhgJZu884wnE6dD+6e5ZhpsMZ vV6TtgZzd6MZSOPZ6fsY2nL/N3gt5D4fX364PlXQo5XcM2qNCZZKcCAIfWW8munf25io cLbTQ0CQXf7mChMYrS46VsmzAuGvZMbIgHTDQMv3934a4t8lgyVRBu5uEUfQPMokEyCF XG3w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=hDP/pAswJGh58QoUAeeE97KUUyyqVcGuQqe+oztZtNg=; fh=ItXasMKUZYMIBTNKWbc/pQ2tIc5aEYAPLlBlNXpgqZY=; b=ajHyqYu2lURWWndu/ggjPpybZLDPX0JfMOEsHvoByL8kuL+RLWfID+lFTdnHCYCwOC xM2LXc6SKHlrxNU8OMvX28DJavibEbC8In7ZcjiHTyzuVMJlDThIOgw77KEa9k8xt1Ni nMbACRpPBcqFBzDJRRYC96OUufcq3lVjmcCRkttlZtLRBaT25K/YLxxmqoWpBXWyOyED 9iKVamzIvmkGS++6tsHnKpXkV6h7QBnju7HjHQy5VmM878LMuQmImhkGf+zsV74BS3c7 iUig6P4wr7zMV6sghD8pzcaSA3FGKMwul9IUtIHqatcWunxoXeBjRl2PQa1tQl5Lm15Q Xjew==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bP8QxXft; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-153732-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-153732-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id dd21-20020a056402313500b005721d2762eesi56922edb.341.2024.04.22.09.43.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 09:43:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-153732-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bP8QxXft; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-153732-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-153732-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 2714C1F202CD for ; Mon, 22 Apr 2024 16:43:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 376BB153BDC; Mon, 22 Apr 2024 16:41:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bP8QxXft" 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 5B90E1514CA; Mon, 22 Apr 2024 16:41:43 +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=1713804103; cv=none; b=cIFEKxZFdZWAgirqgaV747R1gCxvHr73JVzp37BQB59yOdQEHQT2DI68HbxMGPgCpJ6QlumyB3IwEbg7aETEbVfxZCrypD5PqAdFajy5fyIjZMcbFA/+9HE2b5iw7oMJDOY4Dqo/1u65RsrLrKjxDssBXtTwoQQ+osQLrfyrxWI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713804103; c=relaxed/simple; bh=l/KYJencBm4IeGc/cTZjFX/c/6NXNc/MSc7Iy1VR6nw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=qMWl5HlgaWvYkK7hAJ00FIGYp1aoBJcdxOIJ622qt1zQOTOAJj2AvHbAkyFXb8Jy0X3ve1FNj659nHJWY1+OmYkUaXQQ8D4WfgX7kXKWpv0SKRA0wuhwikVkMyXuOsIrVBaPM1pEWwWdiQnr1N2st+PPfHx792Hxp5UMxLwrBZA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bP8QxXft; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B749C113CC; Mon, 22 Apr 2024 16:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713804102; bh=l/KYJencBm4IeGc/cTZjFX/c/6NXNc/MSc7Iy1VR6nw=; h=From:To:Cc:Subject:Date:From; b=bP8QxXftlH5gMk6g0Tpgc587k2Ylr0PCo0igPgoBJmp9iPgSWawPIAPX4foU3dUIA Hde0LHU28N3JtaGpjR/r1pxu0saXHv/ioyPeVmCMlAb5fk1MojFQGadmz6kR1zYLBn zQyQMtW1CjP7mDQ4uA6HnO+SalcGkHSvRQSn974Gq1Ek36NX6HoWuzgjlaMNA87LM8 OI4YVjCtjdG4/E6r1CQL05csEqgCkmQ9aBMTdDjqf4OWcr5k4ZesrqnHk/a5TlU/Qk /pU83/t/zE1bLv3Ev0rewLs0BaV85idXXSCu863CwsRq//7pbOf2J+LGEzyYN0wCgD moE6sv3feGVww== 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 , Jonathan Corbet , Nathan Chancellor , Nicolas Schier , linux-doc@vger.kernel.org Subject: [PATCH v2 0/2] kconfig: remove unneeded 'optional' property support Date: Tue, 23 Apr 2024 01:41:02 +0900 Message-Id: <20240422164104.2869507-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Kconfig support 'optional' for choice blocks, but it is unneeded. Currently, it is only used in arch/sh/Kconfig. Covert it (add a place-holder option, CONFIG_CMDLINE_NO_MODIFY) and clean up the Kconfig code. (Ack from the sh maintainer is appreciated) Masahiro Yamada (2): sh: Convert the last use of 'optional' property in Kconfig kconfig: remove 'optional' property support Documentation/kbuild/kconfig-language.rst | 3 --- 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 + scripts/kconfig/confdata.c | 5 +--- scripts/kconfig/expr.h | 1 - scripts/kconfig/gconf.c | 2 -- scripts/kconfig/lexer.l | 1 - scripts/kconfig/lkc.h | 5 ---- scripts/kconfig/menu.c | 12 +++------ scripts/kconfig/parser.y | 9 ------- scripts/kconfig/tests/choice/Kconfig | 26 ------------------- .../tests/choice/allmod_expected_config | 4 --- .../tests/choice/allyes_expected_config | 4 --- .../tests/choice/oldask0_expected_stdout | 2 -- scripts/kconfig/tests/choice/oldask1_config | 1 - .../tests/choice/oldask1_expected_stdout | 6 ----- 34 files changed, 29 insertions(+), 77 deletions(-) -- 2.40.1