diff options
47 files changed, 2 insertions, 81 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index b211e7961f28..00d6940d4ed7 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -546,19 +546,6 @@ config SIBYTE_SENTOSA | |||
546 | select SYS_SUPPORTS_BIG_ENDIAN | 546 | select SYS_SUPPORTS_BIG_ENDIAN |
547 | select SYS_SUPPORTS_LITTLE_ENDIAN | 547 | select SYS_SUPPORTS_LITTLE_ENDIAN |
548 | 548 | ||
549 | config SIBYTE_PTSWARM | ||
550 | bool "Sibyte BCM91250PT-PTSWARM" | ||
551 | depends on EXPERIMENTAL | ||
552 | select BOOT_ELF32 | ||
553 | select DMA_COHERENT | ||
554 | select NR_CPUS_DEFAULT_2 | ||
555 | select SIBYTE_SB1250 | ||
556 | select SWAP_IO_SPACE | ||
557 | select SYS_HAS_CPU_SB1 | ||
558 | select SYS_SUPPORTS_BIG_ENDIAN | ||
559 | select SYS_SUPPORTS_HIGHMEM | ||
560 | select SYS_SUPPORTS_LITTLE_ENDIAN | ||
561 | |||
562 | config SIBYTE_BIGSUR | 549 | config SIBYTE_BIGSUR |
563 | bool "Sibyte BCM91480B-BigSur" | 550 | bool "Sibyte BCM91480B-BigSur" |
564 | select BOOT_ELF32 | 551 | select BOOT_ELF32 |
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig index 62bcc887f2ca..c28db00fe469 100644 --- a/arch/mips/configs/atlas_defconfig +++ b/arch/mips/configs/atlas_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_MIPS_ATLAS=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 3c70c9d16d01..4bb97a08c9e6 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_SIBYTE_BIGSUR=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index 8ecbbb226c76..128908a542db 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MACH_VR41XX=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 36c13039e237..cb56ebc760e9 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MIPS_COBALT=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index 5a8b7acb7dd7..184f119ff29d 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig | |||
@@ -48,7 +48,6 @@ CONFIG_MIPS_DB1000=y | |||
48 | # CONFIG_SIBYTE_SENTOSA is not set | 48 | # CONFIG_SIBYTE_SENTOSA is not set |
49 | # CONFIG_SIBYTE_RHONE is not set | 49 | # CONFIG_SIBYTE_RHONE is not set |
50 | # CONFIG_SIBYTE_CARMEL is not set | 50 | # CONFIG_SIBYTE_CARMEL is not set |
51 | # CONFIG_SIBYTE_PTSWARM is not set | ||
52 | # CONFIG_SIBYTE_LITTLESUR is not set | 51 | # CONFIG_SIBYTE_LITTLESUR is not set |
53 | # CONFIG_SIBYTE_CRHINE is not set | 52 | # CONFIG_SIBYTE_CRHINE is not set |
54 | # CONFIG_SIBYTE_CRHONE is not set | 53 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig index d4ed90bca269..e61dbee45560 100644 --- a/arch/mips/configs/db1100_defconfig +++ b/arch/mips/configs/db1100_defconfig | |||
@@ -48,7 +48,6 @@ CONFIG_MIPS_DB1100=y | |||
48 | # CONFIG_SIBYTE_SENTOSA is not set | 48 | # CONFIG_SIBYTE_SENTOSA is not set |
49 | # CONFIG_SIBYTE_RHONE is not set | 49 | # CONFIG_SIBYTE_RHONE is not set |
50 | # CONFIG_SIBYTE_CARMEL is not set | 50 | # CONFIG_SIBYTE_CARMEL is not set |
51 | # CONFIG_SIBYTE_PTSWARM is not set | ||
52 | # CONFIG_SIBYTE_LITTLESUR is not set | 51 | # CONFIG_SIBYTE_LITTLESUR is not set |
53 | # CONFIG_SIBYTE_CRHINE is not set | 52 | # CONFIG_SIBYTE_CRHINE is not set |
54 | # CONFIG_SIBYTE_CRHONE is not set | 53 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig index a055657e6983..508faf44ca72 100644 --- a/arch/mips/configs/db1200_defconfig +++ b/arch/mips/configs/db1200_defconfig | |||
@@ -48,7 +48,6 @@ CONFIG_MIPS_DB1200=y | |||
48 | # CONFIG_SIBYTE_SENTOSA is not set | 48 | # CONFIG_SIBYTE_SENTOSA is not set |
49 | # CONFIG_SIBYTE_RHONE is not set | 49 | # CONFIG_SIBYTE_RHONE is not set |
50 | # CONFIG_SIBYTE_CARMEL is not set | 50 | # CONFIG_SIBYTE_CARMEL is not set |
51 | # CONFIG_SIBYTE_PTSWARM is not set | ||
52 | # CONFIG_SIBYTE_LITTLESUR is not set | 51 | # CONFIG_SIBYTE_LITTLESUR is not set |
53 | # CONFIG_SIBYTE_CRHINE is not set | 52 | # CONFIG_SIBYTE_CRHINE is not set |
54 | # CONFIG_SIBYTE_CRHONE is not set | 53 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig index 0ad08cf446ec..5abadf34924d 100644 --- a/arch/mips/configs/db1500_defconfig +++ b/arch/mips/configs/db1500_defconfig | |||
@@ -48,7 +48,6 @@ CONFIG_MIPS_DB1500=y | |||
48 | # CONFIG_SIBYTE_SENTOSA is not set | 48 | # CONFIG_SIBYTE_SENTOSA is not set |
49 | # CONFIG_SIBYTE_RHONE is not set | 49 | # CONFIG_SIBYTE_RHONE is not set |
50 | # CONFIG_SIBYTE_CARMEL is not set | 50 | # CONFIG_SIBYTE_CARMEL is not set |
51 | # CONFIG_SIBYTE_PTSWARM is not set | ||
52 | # CONFIG_SIBYTE_LITTLESUR is not set | 51 | # CONFIG_SIBYTE_LITTLESUR is not set |
53 | # CONFIG_SIBYTE_CRHINE is not set | 52 | # CONFIG_SIBYTE_CRHINE is not set |
54 | # CONFIG_SIBYTE_CRHONE is not set | 53 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig index 057c7d429c80..9ccdcf0848a6 100644 --- a/arch/mips/configs/db1550_defconfig +++ b/arch/mips/configs/db1550_defconfig | |||
@@ -48,7 +48,6 @@ CONFIG_MIPS_DB1550=y | |||
48 | # CONFIG_SIBYTE_SENTOSA is not set | 48 | # CONFIG_SIBYTE_SENTOSA is not set |
49 | # CONFIG_SIBYTE_RHONE is not set | 49 | # CONFIG_SIBYTE_RHONE is not set |
50 | # CONFIG_SIBYTE_CARMEL is not set | 50 | # CONFIG_SIBYTE_CARMEL is not set |
51 | # CONFIG_SIBYTE_PTSWARM is not set | ||
52 | # CONFIG_SIBYTE_LITTLESUR is not set | 51 | # CONFIG_SIBYTE_LITTLESUR is not set |
53 | # CONFIG_SIBYTE_CRHINE is not set | 52 | # CONFIG_SIBYTE_CRHINE is not set |
54 | # CONFIG_SIBYTE_CRHONE is not set | 53 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 2fb350432669..b661cd61ea51 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_MACH_DECSTATION=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index d0d07faeb844..93d19a575008 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MACH_VR41XX=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig index d73d965f7615..f931bcb73ae6 100644 --- a/arch/mips/configs/emma2rh_defconfig +++ b/arch/mips/configs/emma2rh_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_MARKEINS=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/excite_defconfig b/arch/mips/configs/excite_defconfig index 17a866057fd4..dc3058645acc 100644 --- a/arch/mips/configs/excite_defconfig +++ b/arch/mips/configs/excite_defconfig | |||
@@ -48,7 +48,6 @@ CONFIG_BASLER_EXCITE=y | |||
48 | # CONFIG_SIBYTE_SENTOSA is not set | 48 | # CONFIG_SIBYTE_SENTOSA is not set |
49 | # CONFIG_SIBYTE_RHONE is not set | 49 | # CONFIG_SIBYTE_RHONE is not set |
50 | # CONFIG_SIBYTE_CARMEL is not set | 50 | # CONFIG_SIBYTE_CARMEL is not set |
51 | # CONFIG_SIBYTE_PTSWARM is not set | ||
52 | # CONFIG_SIBYTE_LITTLESUR is not set | 51 | # CONFIG_SIBYTE_LITTLESUR is not set |
53 | # CONFIG_SIBYTE_CRHINE is not set | 52 | # CONFIG_SIBYTE_CRHINE is not set |
54 | # CONFIG_SIBYTE_CRHONE is not set | 53 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig index 4ef39a0527cc..d89eeb006c67 100644 --- a/arch/mips/configs/fulong_defconfig +++ b/arch/mips/configs/fulong_defconfig | |||
@@ -33,7 +33,6 @@ CONFIG_LEMOTE_FULONG=y | |||
33 | # CONFIG_SIBYTE_SENTOSA is not set | 33 | # CONFIG_SIBYTE_SENTOSA is not set |
34 | # CONFIG_SIBYTE_RHONE is not set | 34 | # CONFIG_SIBYTE_RHONE is not set |
35 | # CONFIG_SIBYTE_CARMEL is not set | 35 | # CONFIG_SIBYTE_CARMEL is not set |
36 | # CONFIG_SIBYTE_PTSWARM is not set | ||
37 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
38 | # CONFIG_SIBYTE_CRHINE is not set | 37 | # CONFIG_SIBYTE_CRHINE is not set |
39 | # CONFIG_SIBYTE_CRHONE is not set | 38 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 670039bb1a7c..a6957a66838d 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
@@ -36,7 +36,6 @@ CONFIG_SGI_IP22=y | |||
36 | # CONFIG_SIBYTE_SWARM is not set | 36 | # CONFIG_SIBYTE_SWARM is not set |
37 | # CONFIG_SIBYTE_LITTLESUR is not set | 37 | # CONFIG_SIBYTE_LITTLESUR is not set |
38 | # CONFIG_SIBYTE_SENTOSA is not set | 38 | # CONFIG_SIBYTE_SENTOSA is not set |
39 | # CONFIG_SIBYTE_PTSWARM is not set | ||
40 | # CONFIG_SIBYTE_BIGSUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
41 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
42 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 892d4c38fd0d..8feb16a55b56 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_SGI_IP27=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 47f49b60c5d6..ad547c7c6f81 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_SGI_IP32=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig index fa655e247ecc..500daa9c3d82 100644 --- a/arch/mips/configs/jazz_defconfig +++ b/arch/mips/configs/jazz_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_MACH_JAZZ=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index 4ace37838993..8dbfa19496cb 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MIPS=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | CONFIG_TOSHIBA_JMR3927=y | 40 | CONFIG_TOSHIBA_JMR3927=y |
diff --git a/arch/mips/configs/lasat_defconfig b/arch/mips/configs/lasat_defconfig index 2c665fcef089..aa67a3baf53f 100644 --- a/arch/mips/configs/lasat_defconfig +++ b/arch/mips/configs/lasat_defconfig | |||
@@ -36,7 +36,6 @@ CONFIG_LASAT=y | |||
36 | # CONFIG_SIBYTE_SWARM is not set | 36 | # CONFIG_SIBYTE_SWARM is not set |
37 | # CONFIG_SIBYTE_LITTLESUR is not set | 37 | # CONFIG_SIBYTE_LITTLESUR is not set |
38 | # CONFIG_SIBYTE_SENTOSA is not set | 38 | # CONFIG_SIBYTE_SENTOSA is not set |
39 | # CONFIG_SIBYTE_PTSWARM is not set | ||
40 | # CONFIG_SIBYTE_BIGSUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
41 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
42 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 4b7e43c9f69a..9e32b029501e 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
@@ -36,7 +36,6 @@ CONFIG_MIPS_MALTA=y | |||
36 | # CONFIG_SIBYTE_SWARM is not set | 36 | # CONFIG_SIBYTE_SWARM is not set |
37 | # CONFIG_SIBYTE_LITTLESUR is not set | 37 | # CONFIG_SIBYTE_LITTLESUR is not set |
38 | # CONFIG_SIBYTE_SENTOSA is not set | 38 | # CONFIG_SIBYTE_SENTOSA is not set |
39 | # CONFIG_SIBYTE_PTSWARM is not set | ||
40 | # CONFIG_SIBYTE_BIGSUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
41 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
42 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig index 61b72f5a953e..5a7b4ed76906 100644 --- a/arch/mips/configs/mipssim_defconfig +++ b/arch/mips/configs/mipssim_defconfig | |||
@@ -37,7 +37,6 @@ CONFIG_MIPS_SIM=y | |||
37 | # CONFIG_SIBYTE_SWARM is not set | 37 | # CONFIG_SIBYTE_SWARM is not set |
38 | # CONFIG_SIBYTE_LITTLESUR is not set | 38 | # CONFIG_SIBYTE_LITTLESUR is not set |
39 | # CONFIG_SIBYTE_SENTOSA is not set | 39 | # CONFIG_SIBYTE_SENTOSA is not set |
40 | # CONFIG_SIBYTE_PTSWARM is not set | ||
41 | # CONFIG_SIBYTE_BIGSUR is not set | 40 | # CONFIG_SIBYTE_BIGSUR is not set |
42 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
43 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index 8334350d7229..c2f7ce9ff603 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MACH_VR41XX=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/msp71xx_defconfig b/arch/mips/configs/msp71xx_defconfig index 69278999c9a2..af4a41e06e87 100644 --- a/arch/mips/configs/msp71xx_defconfig +++ b/arch/mips/configs/msp71xx_defconfig | |||
@@ -48,7 +48,6 @@ CONFIG_PMC_MSP=y | |||
48 | # CONFIG_SIBYTE_SENTOSA is not set | 48 | # CONFIG_SIBYTE_SENTOSA is not set |
49 | # CONFIG_SIBYTE_RHONE is not set | 49 | # CONFIG_SIBYTE_RHONE is not set |
50 | # CONFIG_SIBYTE_CARMEL is not set | 50 | # CONFIG_SIBYTE_CARMEL is not set |
51 | # CONFIG_SIBYTE_PTSWARM is not set | ||
52 | # CONFIG_SIBYTE_LITTLESUR is not set | 51 | # CONFIG_SIBYTE_LITTLESUR is not set |
53 | # CONFIG_SIBYTE_CRHINE is not set | 52 | # CONFIG_SIBYTE_CRHINE is not set |
54 | # CONFIG_SIBYTE_CRHONE is not set | 53 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig index b536d7c63790..be82f123324d 100644 --- a/arch/mips/configs/mtx1_defconfig +++ b/arch/mips/configs/mtx1_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MACH_ALCHEMY=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index 703d28db05b9..2d394578b969 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig | |||
@@ -48,7 +48,6 @@ CONFIG_MIPS_PB1100=y | |||
48 | # CONFIG_SIBYTE_SENTOSA is not set | 48 | # CONFIG_SIBYTE_SENTOSA is not set |
49 | # CONFIG_SIBYTE_RHONE is not set | 49 | # CONFIG_SIBYTE_RHONE is not set |
50 | # CONFIG_SIBYTE_CARMEL is not set | 50 | # CONFIG_SIBYTE_CARMEL is not set |
51 | # CONFIG_SIBYTE_PTSWARM is not set | ||
52 | # CONFIG_SIBYTE_LITTLESUR is not set | 51 | # CONFIG_SIBYTE_LITTLESUR is not set |
53 | # CONFIG_SIBYTE_CRHINE is not set | 52 | # CONFIG_SIBYTE_CRHINE is not set |
54 | # CONFIG_SIBYTE_CRHONE is not set | 53 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index 82f0c5cee0dc..0d645621ce79 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig | |||
@@ -48,7 +48,6 @@ CONFIG_MIPS_PB1500=y | |||
48 | # CONFIG_SIBYTE_SENTOSA is not set | 48 | # CONFIG_SIBYTE_SENTOSA is not set |
49 | # CONFIG_SIBYTE_RHONE is not set | 49 | # CONFIG_SIBYTE_RHONE is not set |
50 | # CONFIG_SIBYTE_CARMEL is not set | 50 | # CONFIG_SIBYTE_CARMEL is not set |
51 | # CONFIG_SIBYTE_PTSWARM is not set | ||
52 | # CONFIG_SIBYTE_LITTLESUR is not set | 51 | # CONFIG_SIBYTE_LITTLESUR is not set |
53 | # CONFIG_SIBYTE_CRHINE is not set | 52 | # CONFIG_SIBYTE_CRHINE is not set |
54 | # CONFIG_SIBYTE_CRHONE is not set | 53 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig index 147a4fc7fdd8..210a06543116 100644 --- a/arch/mips/configs/pb1550_defconfig +++ b/arch/mips/configs/pb1550_defconfig | |||
@@ -48,7 +48,6 @@ CONFIG_MIPS_PB1550=y | |||
48 | # CONFIG_SIBYTE_SENTOSA is not set | 48 | # CONFIG_SIBYTE_SENTOSA is not set |
49 | # CONFIG_SIBYTE_RHONE is not set | 49 | # CONFIG_SIBYTE_RHONE is not set |
50 | # CONFIG_SIBYTE_CARMEL is not set | 50 | # CONFIG_SIBYTE_CARMEL is not set |
51 | # CONFIG_SIBYTE_PTSWARM is not set | ||
52 | # CONFIG_SIBYTE_LITTLESUR is not set | 51 | # CONFIG_SIBYTE_LITTLESUR is not set |
53 | # CONFIG_SIBYTE_CRHINE is not set | 52 | # CONFIG_SIBYTE_CRHINE is not set |
54 | # CONFIG_SIBYTE_CRHONE is not set | 53 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index f6906b069e04..bee11ebed8ec 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_PNX8550_JBS=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/pnx8550-stb810_defconfig b/arch/mips/configs/pnx8550-stb810_defconfig index b741f81696fb..b088a5ce268f 100644 --- a/arch/mips/configs/pnx8550-stb810_defconfig +++ b/arch/mips/configs/pnx8550-stb810_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_PNX8550_STB810=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig index b3caf5125c15..ec1a6a796599 100644 --- a/arch/mips/configs/qemu_defconfig +++ b/arch/mips/configs/qemu_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_QEMU=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/rbhma4200_defconfig b/arch/mips/configs/rbhma4200_defconfig index a67c698a82d9..16494d0942b8 100644 --- a/arch/mips/configs/rbhma4200_defconfig +++ b/arch/mips/configs/rbhma4200_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MIPS=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index ebc8ad4c6439..aa9e0cf66143 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MIPS=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index fc388118b114..7aaa6d6513f1 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_ZONE_DMA=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index c2798229cbfb..4fe6a0b5c357 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_SIBYTE_SWARM=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig index 2b6282d132a8..aa5733779014 100644 --- a/arch/mips/configs/sead_defconfig +++ b/arch/mips/configs/sead_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_MIPS_SEAD=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig index 326aa7aa40ea..0ae553923f98 100644 --- a/arch/mips/configs/tb0219_defconfig +++ b/arch/mips/configs/tb0219_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MACH_VR41XX=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index 9fd0faeacf53..e1f22023969d 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MACH_VR41XX=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index 499b6bd7ee68..790e62bc0860 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MACH_VR41XX=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index b52256ca0b53..1412c47517ff 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig | |||
@@ -35,7 +35,6 @@ CONFIG_MACH_VR41XX=y | |||
35 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 36 | # CONFIG_SIBYTE_LITTLESUR is not set |
37 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
38 | # CONFIG_SIBYTE_PTSWARM is not set | ||
39 | # CONFIG_SIBYTE_BIGSUR is not set | 38 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SNI_RM is not set | 39 | # CONFIG_SNI_RM is not set |
41 | # CONFIG_TOSHIBA_JMR3927 is not set | 40 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/configs/wrppmc_defconfig b/arch/mips/configs/wrppmc_defconfig index 7e410e10fed7..bbfeeeacc486 100644 --- a/arch/mips/configs/wrppmc_defconfig +++ b/arch/mips/configs/wrppmc_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_WR_PPMC=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig index acaf0e21bb00..980dfb6417e9 100644 --- a/arch/mips/configs/yosemite_defconfig +++ b/arch/mips/configs/yosemite_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_PMC_YOSEMITE=y | |||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 47 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | 48 | # CONFIG_SIBYTE_RHONE is not set |
49 | # CONFIG_SIBYTE_CARMEL is not set | 49 | # CONFIG_SIBYTE_CARMEL is not set |
50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 50 | # CONFIG_SIBYTE_LITTLESUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | 51 | # CONFIG_SIBYTE_CRHINE is not set |
53 | # CONFIG_SIBYTE_CRHONE is not set | 52 | # CONFIG_SIBYTE_CRHONE is not set |
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 670039bb1a7c..a6957a66838d 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig | |||
@@ -36,7 +36,6 @@ CONFIG_SGI_IP22=y | |||
36 | # CONFIG_SIBYTE_SWARM is not set | 36 | # CONFIG_SIBYTE_SWARM is not set |
37 | # CONFIG_SIBYTE_LITTLESUR is not set | 37 | # CONFIG_SIBYTE_LITTLESUR is not set |
38 | # CONFIG_SIBYTE_SENTOSA is not set | 38 | # CONFIG_SIBYTE_SENTOSA is not set |
39 | # CONFIG_SIBYTE_PTSWARM is not set | ||
40 | # CONFIG_SIBYTE_BIGSUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
41 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
42 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c index 50d7c05e15b8..33fce826f8bf 100644 --- a/arch/mips/sibyte/cfe/setup.c +++ b/arch/mips/sibyte/cfe/setup.c | |||
@@ -301,9 +301,6 @@ void __init prom_init(void) | |||
301 | * command line | 301 | * command line |
302 | */ | 302 | */ |
303 | strcpy(arcs_cmdline, "root=/dev/ram0 "); | 303 | strcpy(arcs_cmdline, "root=/dev/ram0 "); |
304 | #ifdef CONFIG_SIBYTE_PTSWARM | ||
305 | strcat(arcs_cmdline, "console=ttyS0,115200 "); | ||
306 | #endif | ||
307 | } else { | 304 | } else { |
308 | /* The loader should have set the command line */ | 305 | /* The loader should have set the command line */ |
309 | /* too early for panic to do any good */ | 306 | /* too early for panic to do any good */ |
diff --git a/include/asm-mips/sibyte/board.h b/include/asm-mips/sibyte/board.h index da198a1c8c81..25372ae0e814 100644 --- a/include/asm-mips/sibyte/board.h +++ b/include/asm-mips/sibyte/board.h | |||
@@ -19,10 +19,8 @@ | |||
19 | #ifndef _SIBYTE_BOARD_H | 19 | #ifndef _SIBYTE_BOARD_H |
20 | #define _SIBYTE_BOARD_H | 20 | #define _SIBYTE_BOARD_H |
21 | 21 | ||
22 | #if defined(CONFIG_SIBYTE_SWARM) || defined(CONFIG_SIBYTE_PTSWARM) || \ | 22 | #if defined(CONFIG_SIBYTE_SWARM) || defined(CONFIG_SIBYTE_CRHONE) || \ |
23 | defined(CONFIG_SIBYTE_PT1120) || defined(CONFIG_SIBYTE_PT1125) || \ | 23 | defined(CONFIG_SIBYTE_CRHINE) || defined(CONFIG_SIBYTE_LITTLESUR) |
24 | defined(CONFIG_SIBYTE_CRHONE) || defined(CONFIG_SIBYTE_CRHINE) || \ | ||
25 | defined(CONFIG_SIBYTE_LITTLESUR) | ||
26 | #include <asm/sibyte/swarm.h> | 24 | #include <asm/sibyte/swarm.h> |
27 | #endif | 25 | #endif |
28 | 26 | ||
diff --git a/include/asm-mips/sibyte/swarm.h b/include/asm-mips/sibyte/swarm.h index 540865fa7ec3..114d9d29ca9d 100644 --- a/include/asm-mips/sibyte/swarm.h +++ b/include/asm-mips/sibyte/swarm.h | |||
@@ -26,24 +26,6 @@ | |||
26 | #define SIBYTE_HAVE_PCMCIA 1 | 26 | #define SIBYTE_HAVE_PCMCIA 1 |
27 | #define SIBYTE_HAVE_IDE 1 | 27 | #define SIBYTE_HAVE_IDE 1 |
28 | #endif | 28 | #endif |
29 | #ifdef CONFIG_SIBYTE_PTSWARM | ||
30 | #define SIBYTE_BOARD_NAME "PTSWARM" | ||
31 | #define SIBYTE_HAVE_PCMCIA 1 | ||
32 | #define SIBYTE_HAVE_IDE 1 | ||
33 | #define SIBYTE_DEFAULT_CONSOLE "ttyS0,115200" | ||
34 | #endif | ||
35 | #ifdef CONFIG_SIBYTE_PT1120 | ||
36 | #define SIBYTE_BOARD_NAME "PT1120" | ||
37 | #define SIBYTE_HAVE_PCMCIA 1 | ||
38 | #define SIBYTE_HAVE_IDE 1 | ||
39 | #define SIBYTE_DEFAULT_CONSOLE "ttyS0,115200" | ||
40 | #endif | ||
41 | #ifdef CONFIG_SIBYTE_PT1125 | ||
42 | #define SIBYTE_BOARD_NAME "PT1125" | ||
43 | #define SIBYTE_HAVE_PCMCIA 1 | ||
44 | #define SIBYTE_HAVE_IDE 1 | ||
45 | #define SIBYTE_DEFAULT_CONSOLE "ttyS0,115200" | ||
46 | #endif | ||
47 | #ifdef CONFIG_SIBYTE_LITTLESUR | 29 | #ifdef CONFIG_SIBYTE_LITTLESUR |
48 | #define SIBYTE_BOARD_NAME "BCM91250C2 (LittleSur)" | 30 | #define SIBYTE_BOARD_NAME "BCM91250C2 (LittleSur)" |
49 | #define SIBYTE_HAVE_PCMCIA 0 | 31 | #define SIBYTE_HAVE_PCMCIA 0 |