Commit 455481fc authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

MIPS: Remove TX39XX support 



No (active) developer owns this hardware, so let's remove Linux support.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
parent fbb1d4b3

arch/mips/Kbuild.platforms

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ platform-$(CONFIG_SIBYTE_SB1250) += sibyte/ 
platform-$(CONFIG_SIBYTE_BCM1x55)	+= sibyte/

platform-$(CONFIG_SIBYTE_BCM1x80)	+= sibyte/

platform-$(CONFIG_SNI_RM)		+= sni/

platform-$(CONFIG_MACH_TX39XX)		+= txx9/

platform-$(CONFIG_MACH_TX49XX)		+= txx9/

platform-$(CONFIG_MACH_VR41XX)		+= vr41xx/

arch/mips/Kconfig

+6 −18
Original line number Diff line number Diff line
@@ -927,9 +927,6 @@ config SNI_RM 
	  Technology and now in turn merged with Fujitsu.  Say Y here to

	  support this machine type.



config MACH_TX39XX

	bool "Toshiba TX39 series based machines"



config MACH_TX49XX

	bool "Toshiba TX49 series based machines"

	select WAR_TX49XX_ICACHE_INDEX_INV
@@ -1584,12 +1581,6 @@ config CPU_R3000 
	  might be a safe bet.  If the resulting kernel does not work,

	  try to recompile with R3000.



config CPU_TX39XX

	bool "R39XX"

	depends on SYS_HAS_CPU_TX39XX

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_R3K_TLB



config CPU_VR41XX

	bool "R41xx"

	depends on SYS_HAS_CPU_VR41XX
@@ -1916,9 +1907,6 @@ config SYS_HAS_CPU_P5600 
config SYS_HAS_CPU_R3000

	bool



config SYS_HAS_CPU_TX39XX

	bool



config SYS_HAS_CPU_VR41XX

	bool
@@ -2149,7 +2137,7 @@ config PAGE_SIZE_8KB 


config PAGE_SIZE_16KB

	bool "16kB"

	depends on !CPU_R3000 && !CPU_TX39XX

	depends on !CPU_R3000

	help

	  Using 16kB page size will result in higher performance kernel at

	  the price of higher memory consumption.  This option is available on
@@ -2168,7 +2156,7 @@ config PAGE_SIZE_32KB 


config PAGE_SIZE_64KB

	bool "64kB"

	depends on !CPU_R3000 && !CPU_TX39XX

	depends on !CPU_R3000

	help

	  Using 64kB page size will result in higher performance kernel at

	  the price of higher memory consumption.  This option is available on
@@ -2236,7 +2224,7 @@ config CPU_HAS_PREFETCH 


config CPU_GENERIC_DUMP_TLB

	bool

	default y if !(CPU_R3000 || CPU_TX39XX)

	default y if !CPU_R3000



config MIPS_FP_SUPPORT

	bool "Floating Point support" if EXPERT
@@ -2256,7 +2244,7 @@ config MIPS_FP_SUPPORT 
config CPU_R2300_FPU

	bool

	depends on MIPS_FP_SUPPORT

	default y if CPU_R3000 || CPU_TX39XX

	default y if CPU_R3000



config CPU_R3K_TLB

	bool
@@ -2575,13 +2563,13 @@ config CPU_R4X00_BUGS64 


config MIPS_ASID_SHIFT

	int

	default 6 if CPU_R3000 || CPU_TX39XX

	default 6 if CPU_R3000

	default 0



config MIPS_ASID_BITS

	int

	default 0 if MIPS_ASID_BITS_VARIABLE

	default 6 if CPU_R3000 || CPU_TX39XX

	default 6 if CPU_R3000

	default 8



config MIPS_ASID_BITS_VARIABLE

arch/mips/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ cflags-y += $(call as-option,-Wa$(comma)-mno-fix-loongson3-llsc,) 
# CPU-dependent compiler/assembler options for optimization.

#

cflags-$(CONFIG_CPU_R3000)	+= -march=r3000

cflags-$(CONFIG_CPU_TX39XX)	+= -march=r3900

cflags-$(CONFIG_CPU_R4300)	+= -march=r4300 -Wa,--trap

cflags-$(CONFIG_CPU_VR41XX)	+= -march=r4100 -Wa,--trap

cflags-$(CONFIG_CPU_R4X00)	+= -march=r4600 -Wa,--trap

arch/mips/configs/jmr3927_defconfig

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_EXPERT=y

CONFIG_SLAB=y

CONFIG_MACH_TX39XX=y

CONFIG_TOSHIBA_JMR3927=y

# CONFIG_SECCOMP is not set

CONFIG_PCI=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_PHYSMAP=y

CONFIG_NETDEVICES=y

CONFIG_TC35815=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_UNIX98_PTYS is not set

CONFIG_SERIAL_NONSTANDARD=y

CONFIG_SERIAL_TXX9_CONSOLE=y

CONFIG_SERIAL_TXX9_STDSERIAL=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_TXX9_WDT=y

# CONFIG_USB_SUPPORT is not set

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1742=y

CONFIG_PROC_KCORE=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

arch/mips/include/asm/cpu-features.h

+0 −3
Original line number Diff line number Diff line
@@ -120,9 +120,6 @@ 
#ifndef cpu_has_4k_cache

#define cpu_has_4k_cache	__isa_ge_or_opt(1, MIPS_CPU_4K_CACHE)

#endif

#ifndef cpu_has_tx39_cache

#define cpu_has_tx39_cache	__opt(MIPS_CPU_TX39_CACHE)

#endif

#ifndef cpu_has_octeon_cache

#define cpu_has_octeon_cache	0

#endif