2023-03-15 14:21:33

by Thomas Bogendoerfer

Subject: [PATCH] MIPS: sibyte: Replace BCM1125H with SB1250 option

SIBYTE_BCM1125H is identical to SIBYTE_SB1250, so remove one of them.

Signed-off-by: Thomas Bogendoerfer <[email protected]>
---
arch/mips/Kconfig | 2 +-
arch/mips/sibyte/Kconfig | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 277daaab1b0d..e1e67b1eae3e 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -808,7 +808,7 @@ config SIBYTE_CRHONE
config SIBYTE_RHONE
bool "Sibyte BCM91125E-Rhone"
select BOOT_ELF32
- select SIBYTE_BCM1125H
+ select SIBYTE_SB1250
select SWAP_IO_SPACE
select SYS_HAS_CPU_SB1
select SYS_SUPPORTS_BIG_ENDIAN
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig
index c4596d49edf1..5fb92fe84149 100644
--- a/arch/mips/sibyte/Kconfig
+++ b/arch/mips/sibyte/Kconfig
@@ -20,17 +20,6 @@ config SIBYTE_BCM1125
select SIBYTE_HAS_ZBUS_PROFILING
select SIBYTE_SB1xxx_SOC

-config SIBYTE_BCM1125H
- bool
- select CEVT_SB1250
- select CSRC_SB1250
- select HAVE_PCI
- select IRQ_MIPS_CPU
- select SIBYTE_BCM112X
- select SIBYTE_ENABLE_LDT_IF_PCI
- select SIBYTE_HAS_ZBUS_PROFILING
- select SIBYTE_SB1xxx_SOC
-
config SIBYTE_BCM112X
bool
select CEVT_SB1250
--
2.35.3

2023-03-17 10:26:08

by Thomas Bogendoerfer

Subject: Re: [PATCH] MIPS: sibyte: Replace BCM1125H with SB1250 option

On Wed, Mar 15, 2023 at 03:21:24PM +0100, Thomas Bogendoerfer wrote:
> SIBYTE_BCM1125H is identical to SIBYTE_SB1250, so remove one of them.
>
> Signed-off-by: Thomas Bogendoerfer <[email protected]>
> ---
> arch/mips/Kconfig | 2 +-
> arch/mips/sibyte/Kconfig | 11 -----------
> 2 files changed, 1 insertion(+), 12 deletions(-)

applied to mips-next.

Thomas.

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