From patchwork Thu Feb 15 14:11:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 201488 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp425873dyb; Thu, 15 Feb 2024 06:12:42 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWO0IaZDnAtNtVVEJ6B+kcZUpM5JhQEI3dMDW/Wrcny5FNg1qk8k7FWnnLBpn4ALPz3gmxSsAq3V1sdhAa5dQE7zw/1tg== X-Google-Smtp-Source: AGHT+IEDiXHJ2YYxRUkI4vBBq2K252FvU80DzGtJEXNJ0HBjyHeUHH0+X3Q5yFjogVoOldhWwIye X-Received: by 2002:a05:6214:224c:b0:68e:f3f7:ec80 with SMTP id c12-20020a056214224c00b0068ef3f7ec80mr2436684qvc.13.1708006362492; Thu, 15 Feb 2024 06:12:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708006362; cv=pass; d=google.com; s=arc-20160816; b=m/XcoIIDYFC1r5y9FqWqLrSzx3Qbm2JrTsgOqnWocb4Gro9YhcxpJeEg3rMaRJQsnO IgD2RqQi/kXm5mmtbPuzzznBCNlsRdL3ODbeZdAQebMDpd6oj39HhbmPB9aSn6L9Cvny Z9WYXVWq/lnaHIml1ufFR1oK3s2/xY8P9LzrSICtRmN2B8ZX8rjiSzH5rR1hrPsNQtjf LJ8jimStcPLuzTk2soLVX0ar2L/MfF+1jPNGeul+KSaqZHHDbdufIhxsIDiYvaclD9gU pDxXW4XDTlKyRqUuGLf7IDbmY72yxeLO0G9od4nNNQwaMD0fR1LibM3qaTqJzlzTQ1jS k/Aw== 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=R0taGJv6b40yzjpm1yQUA3+r885qkIX9DU5AxChi1M8=; fh=F24HS/o2hnRGtnGsrWboPNzP+eqEOwrLezrnqjZ4Rys=; b=w//VJyEOHCWy5DYHz+eSyhdIBVlg475HD/vgsF5cWBqdA1Hwid2liHvHwAKC+MvJQT wVTcKigyGIeWQC5C3QwEw13/bApxkp6HvJNt5vc5DAMyVl2gk+HzHbQpV22qYzGmzBfF Wt41HkDd0LR469MmdSTOGKQ2e2+ehn30mBYhaFNXisfig3+Wi21gZK1ugYfDKa7YAqTn 320qQHKJZkOyNIq9k3jAdnN67L0nCaXsn4jOz4yrZZ34Fvpx2q1F+f41Ncy4VBib50+w MOGNfcdLy1M7L4b5sKPpQGigsGsB59V7v9XrQ7KP54XQ032K80Jwwq2QcrWpHvsY62Yz GG8w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mj2Z5EPB; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-67061-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67061-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id gw5-20020a0562140f0500b0068f2c30f1e8si190002qvb.592.2024.02.15.06.12.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 06:12:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67061-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mj2Z5EPB; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-67061-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67061-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id E8F2B1C20FC7 for ; Thu, 15 Feb 2024 14:12:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CBF26131E5F; Thu, 15 Feb 2024 14:11:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mj2Z5EPB" 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 25549129A73; Thu, 15 Feb 2024 14:11:55 +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=1708006316; cv=none; b=TfLqWrZQ1F/5lbxpIxWhq6LEpHlJ36R9sH9hfIIvLtchCIU43ZP5rw/nE6h79kpIvGmP+cEfY4IPzHpUxw9is9nRPuiTpbFEMxpqoLxOgskpz4qTovARcr7eOKyJC28uR/LnyDnovwfB3lKxDaIyjSH09hspooMq4n96YSB1eFA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708006316; c=relaxed/simple; bh=XYy3bP49P7oTo4EDSM48Irjob5M4yfFqIMI+8HpA4Zk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=R1czyJHtsNcTRjjS9XU3pzLwYEcPvBOHR2myWLTWkdmfZQ8Tt4Tm9o5TYckB59OsBj8jMbiLYguA/s/PQ7hDJu94iNhQJdN77I1V/tZSrzaeCwk5v40un+Dq+7LmbSSARY8WCGbrTsmPbtYT3+FP7bpb2Fp6rW+I6yhIlKrFfjA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mj2Z5EPB; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49AC0C433C7; Thu, 15 Feb 2024 14:11:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708006315; bh=XYy3bP49P7oTo4EDSM48Irjob5M4yfFqIMI+8HpA4Zk=; h=From:To:Cc:Subject:Date:From; b=mj2Z5EPBwwjr9MVw11FS1gD+zb68uRxKFzhTOq5vTkyNbIPmLaC4czEwxNn39Ir/T wfbbEbkTAk8+ip05WTU+grx9GdpfPjdUfcoLM2QbCZ7PCsVcNq1DpUa7gIRWEF9W16 cseTMk4zU3uIZM7+IFCuzE//qQVtZdv7m33U7menH/AG9XghIIdBell59zNhZMTPzo 5TXafuK4Hv3Lsle8kdeX8WZMiNfIt3aIyIFUBmAMcYwzgyADNeYKPDbWiAoCpc2cD0 TKQbyU6v62uaesWKBBH+Qae2+2NXzpqMy9hrO81W0hp/uBpV0pQOwzpc+KBiEdD9pv VuuQepdfvEYXA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Ivan Kokshaysky , Matt Turner , Richard Henderson , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] alpha: merge two entries for CONFIG_ALPHA_EV4 Date: Thu, 15 Feb 2024 23:11:19 +0900 Message-Id: <20240215141120.1911369-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790974479301493577 X-GMAIL-MSGID: 1790974479301493577 There are two entries for CONFIG_ALPHA_EV4, on line 337 and line 368. Merge them together. Signed-off-by: Masahiro Yamada --- arch/alpha/Kconfig | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index d6968d090d49..70e8343d00ba 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -338,6 +338,7 @@ config ALPHA_EV4 bool depends on ALPHA_JENSEN || (ALPHA_SABLE && !ALPHA_GAMMA) || ALPHA_LYNX || ALPHA_NORITAKE && !ALPHA_PRIMO || ALPHA_MIKASA && !ALPHA_PRIMO || ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P_CH || ALPHA_XL || ALPHA_NONAME || ALPHA_EB66 || ALPHA_EB66P || ALPHA_P2K default y if !ALPHA_LYNX + default y if !ALPHA_EV5 config ALPHA_LCA bool @@ -365,10 +366,6 @@ config ALPHA_EV5 bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_LYNX default y if ALPHA_RX164 || ALPHA_RAWHIDE || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_SABLE && ALPHA_GAMMA || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR -config ALPHA_EV4 - bool - default y if ALPHA_LYNX && !ALPHA_EV5 - config ALPHA_CIA bool depends on ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR From patchwork Thu Feb 15 14:11:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 201490 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp426433dyb; Thu, 15 Feb 2024 06:13:28 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUHOj+l0TsBpSE9E15cJhx6EpVNoOC+VNLLhdzFLO1ltTPqzug2OTM5kKUOFD8HY0F/LJvnukRqJiCQzaRcowcsa/AsFQ== X-Google-Smtp-Source: AGHT+IGg2rZ4yHd4czsv/Oa5ocmuY9mKJlWe87QIJoDylJ8YzRfJ2/xsy7lkgU3h4E80XhfXyITJ X-Received: by 2002:a05:6402:12c9:b0:55e:f37f:7fc5 with SMTP id k9-20020a05640212c900b0055ef37f7fc5mr1402840edx.14.1708006408048; Thu, 15 Feb 2024 06:13:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708006408; cv=pass; d=google.com; s=arc-20160816; b=XB8Ug/0IRhZuZVj56OD5EzCTSxUzb0royKyKAZIqZqmmdFT50Y2B44nCu2DYigVVM9 es8fz6VB0X2pzArDBhbXBf/CIC6c5uFywi3rLxLAXpw/We6JrteC40XoXsjnjvKBuFk6 hdepKZcjUdojIayKYxtYCh4dsCLkuRndj1zYkvXPJgKcdr2k6Km00MtlXw+zTpoxNqFA gQiB9LvZ975oaml00o1CAaKXkRPo4cYY1vkkKc83RgF4zkNqCxEQMfMbQrvLRyCKkFYk +xZTRE5xM63OkRg1Efetym2nM/FPdc0nqhLUi4NDJkGpzLHAyIDUZJeZTSkv7NgXcu2V lfbA== 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=hGOwOBgpW3e3ueip2WSr0S44jMb0vSEKc4YqSbNTX90=; fh=F24HS/o2hnRGtnGsrWboPNzP+eqEOwrLezrnqjZ4Rys=; b=D/WerhNdFOnvnE2AB5Cew/qXdZD7avDtPnrSS+MlXqtSClxicc+589pQgc6qh3YIc+ hnO/NFVcd4lcygZCsm45krQUjJFV7GkLe3Wf52qqy71WEt8fM62gmH4EIupx2R5//pPn EH7nd57nxBJggNndf9odhEQFrhlO/DYW4phlMz9NRRRc5q5z3o/b2S3BxskL13J/bgOk FxwU4CZ7PZ0+fU4EgJ2E2pNq5jo5LZDYxpE71fI6k5XgJqJdeyPNt8e4WJ8RPOHFVZkn +fw8GQf0YEaEquZ36PF+VFNyZ62jfrf7bJh9O5bXcLcqYR2ChuOKLO3EQVjwo5H3K48h GeSA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bSLLSvE5; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-67062-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67062-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id s14-20020aa7c54e000000b005639374c08asi683752edr.352.2024.02.15.06.13.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 06:13:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67062-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bSLLSvE5; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-67062-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67062-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 801F11F26583 for ; Thu, 15 Feb 2024 14:12:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AD484132C02; Thu, 15 Feb 2024 14:12:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bSLLSvE5" 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 04E4D131E4A; Thu, 15 Feb 2024 14:11:57 +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=1708006318; cv=none; b=J4z5qmNnGH7h5cGbJCETOB5DAhUk7WKvTfP0oeiQDdVjW+1TrDnE+EOJQMlm5q/6FB4zg06u+6Zzzwj/WPW2MwPWyZ3ghMn6H1Ba63hW7o/QYVVyRs8d8CXrlrWO9OqfO6TBUZJk5GjHoFCGe7spxN74mm6jb0DR3G17wri+3Sk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708006318; c=relaxed/simple; bh=HkxdXeZdYQMmfTagJZLrQcvFjkDeeE9HLvngWwo7L1s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kIun50rJOyln0Jnr4EkkPP5Af+Sx2RNBm99trpXQ5YU4ye6wEd6M46dtx5mE6BlhD015szihf7YcaaKdKiDTPtEhIZ/6W/PP4AdaSdEo4bPRSdxL+Vcb1dtUJD3Z4bVTiMq6dN5rBsycL2IGHDxKZFjm8G9wrDljGftHKquX8nk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bSLLSvE5; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E650C43390; Thu, 15 Feb 2024 14:11:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708006317; bh=HkxdXeZdYQMmfTagJZLrQcvFjkDeeE9HLvngWwo7L1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bSLLSvE5LtJPzOQfN3ak2K2GoCYKASkK5hNELtW6Bd8m+hTWFEif36XLkBFvJ6HV1 Eqea4LFg9iD3Hxhiz+SuaHeIXcbpdImAzq+A/JEfzylA3LuEmV62Thj3PvBM88yjKW oj1Ih95HkCHuS0oUdSkY+6t0lOBY58N0HONa9tnRLRbz4TatZXyQYAzOpjAZ2ALf9b alyHiykfpqvNrq5Qt67Qw3/+OWeZIackOk0J3F5MllY6RbA8I0cO2NksSKcZ0tUnO0 lzgm8/fRJe8Ni7PzqtWynLrPJRchCBfKhs/2wO05KyNF+4n9gmXOt+DnvBFUT2yf27 9G47V0rByCIww== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Ivan Kokshaysky , Matt Turner , Richard Henderson , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] alpha: merge two entries for CONFIG_ALPHA_GAMMA Date: Thu, 15 Feb 2024 23:11:20 +0900 Message-Id: <20240215141120.1911369-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240215141120.1911369-1-masahiroy@kernel.org> References: <20240215141120.1911369-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790974527251044098 X-GMAIL-MSGID: 1790974527251044098 There are two entries for CONFIG_ALPHA_GAMMA, with the second one 7 lines below. Merge them together. Signed-off-by: Masahiro Yamada --- arch/alpha/Kconfig | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 70e8343d00ba..581ca8c73d67 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_GAMMA + 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