Kill R8000 remains.

13 files changed, 10 insertions, 22 deletions

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 470807c9a..d10082bcc 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -67,22 +67,16 @@ ifdef CONFIG_CPU_MIPS32
 GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
 endif
 ifdef CONFIG_CPU_R5000
-GCCFLAGS	+= -mcpu=r8000 -mips2 -Wa,--trap
+GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
 endif
 ifdef CONFIG_CPU_R5432
-GCCFLAGS        += -mcpu=r8000 -mips2 -Wa,--trap
+GCCFLAGS        += -mcpu=r5000 -mips2 -Wa,--trap
 endif
 ifdef CONFIG_CPU_NEVADA
-GCCFLAGS	+= -mcpu=r8000 -mips2 -Wa,--trap -mmad
+GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap -mmad
 endif
 ifdef CONFIG_CPU_RM7000
-GCCFLAGS	+= -mcpu=r8000 -mips2 -Wa,--trap
-endif
-ifdef CONFIG_CPU_R8000
-GCCFLAGS	+= -mcpu=r8000 -mips2 -Wa,--trap
-endif
-ifdef CONFIG_CPU_R10000
-GCCFLAGS	+= -mcpu=r8000 -mips2 -Wa,--trap
+GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
 endif
 
 ifdef CONFIG_MIPS_FPU_EMULATOR
diff --git a/arch/mips/config.in b/arch/mips/config.in
index f5f8b7a44..fae1fe91d 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -199,7 +199,6 @@ choice 'CPU type' \
          R5432 CONFIG_CPU_R5432 \
 	 RM7000 CONFIG_CPU_RM7000 \
 	 R52xx CONFIG_CPU_NEVADA \
-	 R8000 CONFIG_CPU_R8000	\
 	 R10000 CONFIG_CPU_R10000 \
 	 MIPS32 CONFIG_CPU_MIPS32" R4x00
 
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index 1f78df82e..ccc577cb4 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -60,7 +60,6 @@ CONFIG_CPU_R5000=y
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_ADVANCED is not set
diff --git a/arch/mips/defconfig-atlas b/arch/mips/defconfig-atlas
index c4d0780e5..277942218 100644
--- a/arch/mips/defconfig-atlas
+++ b/arch/mips/defconfig-atlas
@@ -55,7 +55,6 @@ CONFIG_CPU_R5000=y
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_ADVANCED is not set
diff --git a/arch/mips/defconfig-ddb5476 b/arch/mips/defconfig-ddb5476
index f5aea46b9..6cb031d5e 100644
--- a/arch/mips/defconfig-ddb5476
+++ b/arch/mips/defconfig-ddb5476
@@ -37,6 +37,7 @@ CONFIG_ISA=y
 CONFIG_PCI=y
 CONFIG_PC_KEYB=y
 CONFIG_ROTTEN_IRQ=y
+CONFIG_HAVE_STD_PC_SERIAL_PORT=y
 CONFIG_EISA=y
 
 #
@@ -56,7 +57,6 @@ CONFIG_EISA=y
 CONFIG_CPU_R5432=y
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_ADVANCED is not set
diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation
index 6da63e12a..48aea4156 100644
--- a/arch/mips/defconfig-decstation
+++ b/arch/mips/defconfig-decstation
@@ -56,7 +56,6 @@ CONFIG_CPU_R3000=y
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_ADVANCED is not set
diff --git a/arch/mips/defconfig-ev64120 b/arch/mips/defconfig-ev64120
index 8f08b2f7a..6a2a709a8 100644
--- a/arch/mips/defconfig-ev64120
+++ b/arch/mips/defconfig-ev64120
@@ -62,7 +62,6 @@ CONFIG_CPU_R5000=y
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_ADVANCED is not set
diff --git a/arch/mips/defconfig-ev96100 b/arch/mips/defconfig-ev96100
index 7c7b0eb2e..e27dd4b01 100644
--- a/arch/mips/defconfig-ev96100
+++ b/arch/mips/defconfig-ev96100
@@ -58,7 +58,6 @@ CONFIG_MODULES=y
 # CONFIG_CPU_R5432 is not set
 CONFIG_CPU_RM7000=y
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_MIPS32 is not set
 CONFIG_CPU_ADVANCED=y
diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22
index 1f78df82e..ccc577cb4 100644
--- a/arch/mips/defconfig-ip22
+++ b/arch/mips/defconfig-ip22
@@ -60,7 +60,6 @@ CONFIG_CPU_R5000=y
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_ADVANCED is not set
diff --git a/arch/mips/defconfig-it8172 b/arch/mips/defconfig-it8172
index e8b3f37e8..ff6b40996 100644
--- a/arch/mips/defconfig-it8172
+++ b/arch/mips/defconfig-it8172
@@ -63,7 +63,6 @@ CONFIG_MODULES=y
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_RM7000 is not set
 CONFIG_CPU_NEVADA=y
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_ADVANCED is not set
@@ -424,6 +423,10 @@ CONFIG_SERIAL=y
 CONFIG_SERIAL_CONSOLE=y
 # CONFIG_SERIAL_EXTENDED is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_QTRONIX_KEYBOARD=y
+CONFIG_IT8172_CIR=y
+# CONFIG_IT8172_SCR0 is not set
+# CONFIG_IT8172_SCR1 is not set
 # CONFIG_UNIX98_PTYS is not set
 
 #
@@ -464,6 +467,7 @@ CONFIG_SERIAL_CONSOLE=y
 # CONFIG_FTAPE is not set
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
+# CONFIG_ITE_GPIO is not set
 
 #
 # Multimedia devices
diff --git a/arch/mips/defconfig-malta b/arch/mips/defconfig-malta
index fa626a521..770f2fc48 100644
--- a/arch/mips/defconfig-malta
+++ b/arch/mips/defconfig-malta
@@ -56,7 +56,6 @@ CONFIG_SWAP_IO_SPACE=y
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 CONFIG_CPU_MIPS32=y
 # CONFIG_CPU_ADVANCED is not set
diff --git a/arch/mips/defconfig-ocelot b/arch/mips/defconfig-ocelot
index acf8331bb..f468b324e 100644
--- a/arch/mips/defconfig-ocelot
+++ b/arch/mips/defconfig-ocelot
@@ -56,7 +56,6 @@ CONFIG_SWAP_IO_SPACE=y
 # CONFIG_CPU_R5432 is not set
 CONFIG_CPU_RM7000=y
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_ADVANCED is not set
diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200
index d5196eb35..3f3e8dfdf 100644
--- a/arch/mips/defconfig-rm200
+++ b/arch/mips/defconfig-rm200
@@ -59,7 +59,6 @@ CONFIG_CPU_R5000=y
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_ADVANCED is not set