Commit b984d7b5 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

MIPS: sibyte: Remove unused config option SIBYTE_BCM1x55 



SIBYTE_BCM1x55 is not selected anywhere, so let's get rid of it.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 1150e181

arch/mips/Kbuild.platforms

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ platform-$(CONFIG_SGI_IP30) += sgi-ip30/ 
platform-$(CONFIG_SGI_IP32)		+= sgi-ip32/

platform-$(CONFIG_SIBYTE_BCM112X)	+= sibyte/

platform-$(CONFIG_SIBYTE_SB1250)	+= sibyte/

platform-$(CONFIG_SIBYTE_BCM1x55)	+= sibyte/

platform-$(CONFIG_SIBYTE_BCM1x80)	+= sibyte/

platform-$(CONFIG_SNI_RM)		+= sni/

platform-$(CONFIG_MACH_TX49XX)		+= txx9/

arch/mips/sibyte/Kconfig

+1 −12
Original line number Diff line number Diff line
@@ -58,16 +58,6 @@ config SIBYTE_BCM1x80 
	select SIBYTE_SB1xxx_SOC

	select SYS_SUPPORTS_SMP



config SIBYTE_BCM1x55

	bool

	select CEVT_BCM1480

	select CSRC_BCM1480

	select HAVE_PCI

	select IRQ_MIPS_CPU

	select SIBYTE_SB1xxx_SOC

	select SIBYTE_HAS_ZBUS_PROFILING

	select SYS_SUPPORTS_SMP



config SIBYTE_SB1xxx_SOC

	bool

	select IRQ_MIPS_CPU
@@ -143,8 +133,7 @@ config SIBYTE_CFE_CONSOLE 
config SIBYTE_BUS_WATCHER

	bool "Support for Bus Watcher statistics"

	depends on SIBYTE_SB1xxx_SOC && \

		(SIBYTE_BCM112X || SIBYTE_SB1250 || \

		 SIBYTE_BCM1x55 || SIBYTE_BCM1x80)

		(SIBYTE_BCM112X || SIBYTE_SB1250 || SIBYTE_BCM1x80)

	help

	  Handle and keep statistics on the bus error interrupts (COR_ECC,

	  BAD_ECC, IO_BUS).

arch/mips/sibyte/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ obj-$(CONFIG_SIBYTE_BCM112X) += sb1250/ 
obj-$(CONFIG_SIBYTE_BCM112X)	+= common/

obj-$(CONFIG_SIBYTE_SB1250)	+= sb1250/

obj-$(CONFIG_SIBYTE_SB1250)	+= common/

obj-$(CONFIG_SIBYTE_BCM1x55)	+= bcm1480/

obj-$(CONFIG_SIBYTE_BCM1x55)	+= common/

obj-$(CONFIG_SIBYTE_BCM1x80)	+= bcm1480/

obj-$(CONFIG_SIBYTE_BCM1x80)	+= common/

arch/mips/sibyte/Platform

+0 −4
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ cflags-$(CONFIG_SIBYTE_SB1250) += \ 
		-I$(srctree)/arch/mips/include/asm/mach-sibyte		\

		-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL



cflags-$(CONFIG_SIBYTE_BCM1x55) +=					\

		-I$(srctree)/arch/mips/include/asm/mach-sibyte		\

		-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL



cflags-$(CONFIG_SIBYTE_BCM1x80) +=					\

		-I$(srctree)/arch/mips/include/asm/mach-sibyte		\

		-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL

arch/mips/sibyte/common/bus_watcher.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <asm/sibyte/sb1250_regs.h>

#include <asm/sibyte/sb1250_int.h>

#include <asm/sibyte/sb1250_scd.h>

#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)

#ifdef CONFIG_SIBYTE_BCM1x80

#include <asm/sibyte/bcm1480_regs.h>

#endif
@@ -71,7 +71,7 @@ void check_bus_watcher(void) 
#if defined(CONFIG_SIBYTE_BCM112X) || defined(CONFIG_SIBYTE_SB1250)

	/* Use non-destructive register */

	status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS_DEBUG));

#elif defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)

#elif defined(CONFIG_SIBYTE_BCM1x80)

	/* Use non-destructive register */

	/* Same as 1250 except BUS_ERR_STATUS_DEBUG is in a different place. */

	status = csr_in32(IOADDR(A_BCM1480_BUS_ERR_STATUS_DEBUG));