Skip to content

Commit 21d638e

Browse files
committed
MIPS: TXX9: Remove rbtx4938 board support
No active MIPS user own this board, so let's remove it. Signed-off-by: Thomas Bogendoerfer <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Tested-by: Geert Uytterhoeven <[email protected]>
1 parent f2c6c22 commit 21d638e

File tree

15 files changed

+0
-930
lines changed

15 files changed

+0
-930
lines changed

arch/mips/configs/rbtx49xx_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ CONFIG_EXPERT=y
1010
CONFIG_SLAB=y
1111
CONFIG_MACH_TX49XX=y
1212
CONFIG_TOSHIBA_RBTX4927=y
13-
CONFIG_TOSHIBA_RBTX4938=y
1413
CONFIG_TOSHIBA_RBTX4939=y
15-
CONFIG_TOSHIBA_RBTX4938_MPLEX_KEEP=y
1614
# CONFIG_SECCOMP is not set
1715
CONFIG_PCI=y
1816
CONFIG_MODULES=y

arch/mips/include/asm/txx9/boards.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ BOARD_VEC(jmr3927_vec)
66
BOARD_VEC(rbtx4927_vec)
77
BOARD_VEC(rbtx4937_vec)
88
#endif
9-
#ifdef CONFIG_TOSHIBA_RBTX4938
10-
BOARD_VEC(rbtx4938_vec)
11-
#endif
129
#ifdef CONFIG_TOSHIBA_RBTX4939
1310
BOARD_VEC(rbtx4939_vec)
1411
#endif

arch/mips/include/asm/txx9/rbtx4938.h

Lines changed: 0 additions & 145 deletions
This file was deleted.

arch/mips/include/asm/txx9/spi.h

Lines changed: 0 additions & 34 deletions
This file was deleted.

arch/mips/pci/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ obj-$(CONFIG_SOC_TX4927) += pci-tx4927.o
5151
obj-$(CONFIG_SOC_TX4938) += pci-tx4938.o
5252
obj-$(CONFIG_SOC_TX4939) += pci-tx4939.o
5353
obj-$(CONFIG_TOSHIBA_RBTX4927) += fixup-rbtx4927.o
54-
obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-rbtx4938.o
5554
obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
5655
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
5756
obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o

arch/mips/pci/fixup-rbtx4938.c

Lines changed: 0 additions & 53 deletions
This file was deleted.

arch/mips/txx9/Kconfig

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@ config TOSHIBA_RBTX4927
3939
This Toshiba board is based on the TX4927 processor. Say Y here to
4040
support this machine type
4141

42-
config TOSHIBA_RBTX4938
43-
bool "Toshiba RBTX4938 board"
44-
depends on MACH_TX49XX
45-
select SOC_TX4938
46-
help
47-
This Toshiba board is based on the TX4938 processor. Say Y here to
48-
support this machine type
49-
5042
config TOSHIBA_RBTX4939
5143
bool "Toshiba RBTX4939 board"
5244
depends on MACH_TX49XX
@@ -105,25 +97,5 @@ config PICMG_PCI_BACKPLANE_DEFAULT
10597
depends on PCI && MACH_TXX9
10698
default y if !TOSHIBA_FPCIB0
10799

108-
if TOSHIBA_RBTX4938
109-
110-
comment "Multiplex Pin Select"
111-
choice
112-
prompt "PIO[58:61]"
113-
default TOSHIBA_RBTX4938_MPLEX_PIO58_61
114-
115-
config TOSHIBA_RBTX4938_MPLEX_PIO58_61
116-
bool "PIO"
117-
config TOSHIBA_RBTX4938_MPLEX_NAND
118-
bool "NAND"
119-
config TOSHIBA_RBTX4938_MPLEX_ATA
120-
bool "ATA"
121-
config TOSHIBA_RBTX4938_MPLEX_KEEP
122-
bool "Keep firmware settings"
123-
124-
endchoice
125-
126-
endif
127-
128100
config PCI_TX4927
129101
bool

arch/mips/txx9/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ obj-$(CONFIG_TOSHIBA_JMR3927) += jmr3927/
1414
# Toshiba RBTX49XX boards
1515
#
1616
obj-$(CONFIG_TOSHIBA_RBTX4927) += rbtx4927/
17-
obj-$(CONFIG_TOSHIBA_RBTX4938) += rbtx4938/
1817
obj-$(CONFIG_TOSHIBA_RBTX4939) += rbtx4939/

arch/mips/txx9/generic/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ obj-$(CONFIG_SOC_TX4927) += mem_tx4927.o setup_tx4927.o irq_tx4927.o
1010
obj-$(CONFIG_SOC_TX4938) += mem_tx4927.o setup_tx4938.o irq_tx4938.o
1111
obj-$(CONFIG_SOC_TX4939) += setup_tx4939.o irq_tx4939.o
1212
obj-$(CONFIG_TOSHIBA_FPCIB0) += smsc_fdc37m81x.o
13-
obj-$(CONFIG_SPI) += spi_eeprom.o
1413
obj-$(CONFIG_TXX9_7SEGLED) += 7segled.o

arch/mips/txx9/generic/setup.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,6 @@ static void __init select_board(void)
315315
txx9_board_vec = &rbtx4937_vec;
316316
break;
317317
#endif
318-
#ifdef CONFIG_TOSHIBA_RBTX4938
319-
case 0x4938:
320-
txx9_board_vec = &rbtx4938_vec;
321-
break;
322-
#endif
323318
#ifdef CONFIG_TOSHIBA_RBTX4939
324319
case 0x4939:
325320
txx9_board_vec = &rbtx4939_vec;

0 commit comments

Comments
 (0)