| Message ID | 20240204141446.65055-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | MIPS: merge CONFIG_MACH_TX49XX entries | expand |
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.
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 - config MIKROTIK_RB532 bool "Mikrotik RB532 boards" select CEVT_R4K diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig index 7335efa4d528..d633dba7406b 100644 --- a/arch/mips/txx9/Kconfig +++ b/arch/mips/txx9/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 config MACH_TX49XX - bool + bool "Toshiba TX49 series based machines" select BOOT_ELF32 select MACH_TXX9 select CEVT_R4K @@ -8,6 +8,7 @@ config MACH_TX49XX select IRQ_MIPS_CPU select SYS_HAS_CPU_TX49XX select SYS_SUPPORTS_64BIT_KERNEL + select WAR_TX49XX_ICACHE_INDEX_INV config MACH_TXX9 bool
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(-)