MIPS: merge CONFIG_MACH_TX49XX entries
PATCH 1/1 MIPS: merge CONFIG_MACH_TX49XX entries
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.
---
arch/mips/Kconfig | 4 ---- arch/mips/txx9/Kconfig | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-)
arch/mips/Kconfig +0 -4
@@ -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
arch/mips/txx9/Kconfig +2 -1
@@ -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
Signature · 1 line
2.40.1
Thomas Bogendoerfer
maintainerQuoted 23 lines · Masahiro Yamada
The 'config
MACH_TX49XX' entry exists inarch/mips/Kconfigwith a prompt and one select statement, also inarch/mips/txx9/Kconfigwith the other select statements.Commit
8f8da9adebdf("[MIPS] TXx9:Kconfigcleanup") added the second entry toarch/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 <[email protected]>---
arch/mips/Kconfig | 4 ---- arch/mips/txx9/Kconfig | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-)arch/mips/Kconfig +0
-0
arch/mips/Kconfig config SNI_RM · line 886
Quoted 6 lines
arch/mips/Kconfig +0
-3@@ -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.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]