@@ -927,9 +927,6 @@ config SNI_RM
927927 Technology and now in turn merged with Fujitsu. Say Y here to
928928 support this machine type.
929929
930- config MACH_TX39XX
931- bool "Toshiba TX39 series based machines"
932-
933930config MACH_TX49XX
934931 bool "Toshiba TX49 series based machines"
935932 select WAR_TX49XX_ICACHE_INDEX_INV
@@ -1584,12 +1581,6 @@ config CPU_R3000
15841581 might be a safe bet. If the resulting kernel does not work,
15851582 try to recompile with R3000.
15861583
1587- config CPU_TX39XX
1588- bool "R39XX"
1589- depends on SYS_HAS_CPU_TX39XX
1590- select CPU_SUPPORTS_32BIT_KERNEL
1591- select CPU_R3K_TLB
1592-
15931584config CPU_VR41XX
15941585 bool "R41xx"
15951586 depends on SYS_HAS_CPU_VR41XX
@@ -1916,9 +1907,6 @@ config SYS_HAS_CPU_P5600
19161907config SYS_HAS_CPU_R3000
19171908 bool
19181909
1919- config SYS_HAS_CPU_TX39XX
1920- bool
1921-
19221910config SYS_HAS_CPU_VR41XX
19231911 bool
19241912
@@ -2149,7 +2137,7 @@ config PAGE_SIZE_8KB
21492137
21502138config PAGE_SIZE_16KB
21512139 bool "16kB"
2152- depends on !CPU_R3000 && !CPU_TX39XX
2140+ depends on !CPU_R3000
21532141 help
21542142 Using 16kB page size will result in higher performance kernel at
21552143 the price of higher memory consumption. This option is available on
@@ -2168,7 +2156,7 @@ config PAGE_SIZE_32KB
21682156
21692157config PAGE_SIZE_64KB
21702158 bool "64kB"
2171- depends on !CPU_R3000 && !CPU_TX39XX
2159+ depends on !CPU_R3000
21722160 help
21732161 Using 64kB page size will result in higher performance kernel at
21742162 the price of higher memory consumption. This option is available on
@@ -2236,7 +2224,7 @@ config CPU_HAS_PREFETCH
22362224
22372225config CPU_GENERIC_DUMP_TLB
22382226 bool
2239- default y if !( CPU_R3000 || CPU_TX39XX)
2227+ default y if !CPU_R3000
22402228
22412229config MIPS_FP_SUPPORT
22422230 bool "Floating Point support" if EXPERT
@@ -2256,7 +2244,7 @@ config MIPS_FP_SUPPORT
22562244config CPU_R2300_FPU
22572245 bool
22582246 depends on MIPS_FP_SUPPORT
2259- default y if CPU_R3000 || CPU_TX39XX
2247+ default y if CPU_R3000
22602248
22612249config CPU_R3K_TLB
22622250 bool
@@ -2575,13 +2563,13 @@ config CPU_R4X00_BUGS64
25752563
25762564config MIPS_ASID_SHIFT
25772565 int
2578- default 6 if CPU_R3000 || CPU_TX39XX
2566+ default 6 if CPU_R3000
25792567 default 0
25802568
25812569config MIPS_ASID_BITS
25822570 int
25832571 default 0 if MIPS_ASID_BITS_VARIABLE
2584- default 6 if CPU_R3000 || CPU_TX39XX
2572+ default 6 if CPU_R3000
25852573 default 8
25862574
25872575config MIPS_ASID_BITS_VARIABLE
0 commit comments