Message ID | 20240221140145.2658672-2-masahiroy@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-74843-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1067072dyc; Wed, 21 Feb 2024 06:22:42 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVRuyo7EWeATMYk/vt1FoxNWBASOlLdEJSd2ACEoNfpMBt8ZWssykIntkS9K6uIUbSmFcQLTgSckEmn+nz8xXuhihIoQQ== X-Google-Smtp-Source: AGHT+IEAp8cYhcgAkPEJ/He+S1G2PNJdWzv/b+SNrjcydXMA/lt1wYgC/BVEHDdlug69rCLyNeLI X-Received: by 2002:a17:90a:8003:b0:299:7d18:43d2 with SMTP id b3-20020a17090a800300b002997d1843d2mr8246067pjn.33.1708525361823; Wed, 21 Feb 2024 06:22:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708525361; cv=pass; d=google.com; s=arc-20160816; b=z3cYte0UVcRWR1yhfBjOHYCEgRaCbczHu3QZkQwkaxQSl+1zC6+IRWOA3vnin4/vxT RJWYJfJ0FMVnQY5vxYWs7Gs6jZXkOzz0/+xfQ9mqkiehytYXbdvAtrvS9dyRxswcOzzA fu2MCn7ZMIXhZSMtmNuIlU3/KAWtvJwB2L22NqlDxux6fB+JGNFBh08A7XEB8pNYI2Xi W6HepCRderVRz1L6xT+mzpYmFQcx59tDykPbeBMqqIaB58vrgq904E+OIn1lzvfgDsp+ o46Y2Qfsj+E/wmqOnLHXefFxLC/dua0qMMpQGka2SphMbR8bW/cUpMpmeCABpoWYP0Pz qVkA== 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:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=JPBgpu+YyRzEm9zczQgItFd0mpKXkKsbkj7xumXpZaI=; fh=iG4HccP72R7PHRtOBOeFefJA54NWnMv3WNOyOVAYxRg=; b=zHOd7urKoMv+aiYBaVkX/rnhXHugYy4IL+m3/+KgJ/rwmxIKtT2QjscVZLjzW9NFoP gYzj5Jmt3b7HYZO6/CknevcV/KsAUyko3Z7GYaiCeeAsS+vKACdORwD18ilQwfDfgQax pcUwpgdRGDkRwnznRz1oodG4fsMCN+WNi5F03w/BOvONyGXlafpxpS4p03IcPNHhzzVv 0nEV7ZtgNhczgZzccrsjEm2TXN2fQjSkJyMHjJWoy+fDlhnzuYjsKW/m9GMbdb0n8kYm qeXiHVI5NCtlcMkqqJ+BjBFxqz/M6R6U9see0M7fPoS8yKz9bEyAguWL1PWIAFAJDDRv NtAQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AewEnIyy; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-74843-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74843-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id oe13-20020a17090b394d00b0029a27d6635csi738674pjb.6.2024.02.21.06.22.41 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 06:22:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-74843-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AewEnIyy; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-74843-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74843-ouuuleilei=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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 1EDBFB25BF2 for <ouuuleilei@gmail.com>; Wed, 21 Feb 2024 14:03:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A5E8A7EF18; Wed, 21 Feb 2024 14:01:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AewEnIyy" 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 0D1F27E76D; Wed, 21 Feb 2024 14:01:53 +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=1708524113; cv=none; b=a8MCxUnozlnfByARk7y7CF96hCcZkzEzrwHu5pLYqDVI3IFGW1bOgbCatgJA406TofqEO+9ErC3E04Ejz+7pbVEp31nowRwqyOU4YCDIpHjgIqucNmJbND04kjWGNGjlr088O4Y6HgnKBqUTXjUlPdxmvn4ETQ0vhAfVVTNMK2U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708524113; c=relaxed/simple; bh=tOPetmVZd5nriXjwm0xC4K1pqFu30tsSqsbo9u/5sZw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=l5N0Ne0/LXbRm0jkFqCVz9UosVbUXq/h9kNl+DdswMap4IRpgzDWHGItKPdO6IXvKz7yOsClL1VRntte4CssB/WEwg/TMtaxVKtaObqUoJ7puP019nyQOzNjcVcihh9tWmLBBAPqyxBWq2bb+C4nVwaAzh1I8IEj9omYfTcd2jA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AewEnIyy; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7018CC433F1; Wed, 21 Feb 2024 14:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708524112; bh=tOPetmVZd5nriXjwm0xC4K1pqFu30tsSqsbo9u/5sZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AewEnIyy777/EeptGwRt71ElB8skmaU4o+fqRZsSNKKxnS6ImqSO4Eq53iN/eArsY 6k+zgEkZxybRB8iV+5YntiKda9vR9/gkcsgyp8bFqFVx+ue3BinNRv9P3Wtlf7n/4u KKm9pUaY1gzwbnI7cVHlGS4txIQ9j2IsvNbOZsfP/S8GP73ffvGVOm4f7cz3brOTvT jGZcYe/94HchbESbwqtw8DTVKYy9AebP7Fg2VnYWDWW76Sb4Bo1uZWMe8l6Pazjt35 ba33s958lTY/QFowNdzt0ou96D3U525UQk/C7ZhdApyNBv9LNscUsc7GxXSrs19UNM gVRzyPhaQ2NiA== From: Masahiro Yamada <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada <masahiroy@kernel.org>, Ivan Kokshaysky <ink@jurassic.park.msu.ru>, Matt Turner <mattst88@gmail.com>, Richard Henderson <richard.henderson@linaro.org>, linux-alpha@vger.kernel.org Subject: [PATCH v2 2/2] alpha: merge two entries for CONFIG_ALPHA_GAMMA Date: Wed, 21 Feb 2024 23:01:45 +0900 Message-Id: <20240221140145.2658672-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240221140145.2658672-1-masahiroy@kernel.org> References: <20240221140145.2658672-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791518690162180782 X-GMAIL-MSGID: 1791518690162180782 |
Series |
[v2,1/2] alpha: merge two entries for CONFIG_ALPHA_EV4
|
|
Commit Message
Masahiro Yamada
Feb. 21, 2024, 2:01 p.m. UTC
There are two entries for CONFIG_ALPHA_GAMMA, with the second one
7 lines below. Merge them together.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
Changes in v2:
- Fix the 'depends on' line
arch/alpha/Kconfig | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 70e8343d00ba..fe5ae3aea999 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -390,16 +390,12 @@ config ALPHA_PRIMO Say Y if you have an AS 1000 5/xxx or an AS 1000A 5/xxx. config ALPHA_GAMMA - bool "EV5 CPU(s) (model 5/xxx)?" - depends on ALPHA_SABLE + bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_SABLE + depends on ALPHA_SABLE || ALPHA_LYNX + default ALPHA_LYNX help Say Y if you have an AS 2000 5/xxx or an AS 2100 5/xxx. -config ALPHA_GAMMA - bool - depends on ALPHA_LYNX - default y - config ALPHA_T2 bool depends on ALPHA_SABLE || ALPHA_LYNX