Received-SPF: pass (google.com: domain of linux-kernel+bounces-73098-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Tue, 20 Feb 2024 14:48:33 +0100
From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] MIPS: merge CONFIG_MACH_TX49XX entries
Message-ID: <ZdStsYqTkYBhCS4M@alpha.franken.de>
References: <20240204141446.65055-1-masahiroy@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240204141446.65055-1-masahiroy@kernel.org>

On Sun, Feb 04, 2024 at 11:14:45PM +0900, Masahiro Yamada wrote:
> The 'config MACH_TX49XX' entry exists in arch/mips/Kconfig with a
> prompt and one select statement, also in arch/mips/txx9/Kconfig with
> the other select statements.
> 
> Commit 8f8da9adebdf ("[MIPS] TXx9: Kconfig cleanup") added the second
> entry to arch/mips/txx9/Kconfig.
> 
> There is no reason to split it in the two locations.
> 
> Merge them into the entry in arch/mips/txx9/Kconfig.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
> 
>  arch/mips/Kconfig      | 4 ----
>  arch/mips/txx9/Kconfig | 3 ++-
>  2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index a70b4f959fb1..b7c62f8d612e 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -881,10 +881,6 @@ config SNI_RM
>  	  Technology and now in turn merged with Fujitsu.  Say Y here to
>  	  support this machine type.
>  
> -config MACH_TX49XX
> -	bool "Toshiba TX49 series based machines"
> -	select WAR_TX49XX_ICACHE_INDEX_INV

this is inside the choice for selecting the platform. Removing it here
breaks the build. IMHO the merge must be here.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]