diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2009-09-16 20:25:06 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-09-17 14:07:50 -0400 |
commit | f7ade3c168e4f437c11f57be012992bbb0e3075c (patch) | |
tree | f559580760807528f9178d29aa4c89c806a8d79d /arch/mips/Kconfig | |
parent | b8d6f78cd058e34ec706f7cb353fdb2eb743c050 (diff) |
MIPS: Get rid of CONFIG_CPU_HAS_LLSC
CONFIG_CPU_HAS_LLSC duplicated the function of cpu_has_llsc for no good
reason and and the results if the one was enabled and the other disabled
was very unobvious. Remove it now that there are no more remaining users.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 466920aa067f..224e548f0fc8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -1041,7 +1041,6 @@ config CPU_LOONGSON2E | |||
1041 | config CPU_MIPS32_R1 | 1041 | config CPU_MIPS32_R1 |
1042 | bool "MIPS32 Release 1" | 1042 | bool "MIPS32 Release 1" |
1043 | depends on SYS_HAS_CPU_MIPS32_R1 | 1043 | depends on SYS_HAS_CPU_MIPS32_R1 |
1044 | select CPU_HAS_LLSC | ||
1045 | select CPU_HAS_PREFETCH | 1044 | select CPU_HAS_PREFETCH |
1046 | select CPU_SUPPORTS_32BIT_KERNEL | 1045 | select CPU_SUPPORTS_32BIT_KERNEL |
1047 | select CPU_SUPPORTS_HIGHMEM | 1046 | select CPU_SUPPORTS_HIGHMEM |
@@ -1059,7 +1058,6 @@ config CPU_MIPS32_R1 | |||
1059 | config CPU_MIPS32_R2 | 1058 | config CPU_MIPS32_R2 |
1060 | bool "MIPS32 Release 2" | 1059 | bool "MIPS32 Release 2" |
1061 | depends on SYS_HAS_CPU_MIPS32_R2 | 1060 | depends on SYS_HAS_CPU_MIPS32_R2 |
1062 | select CPU_HAS_LLSC | ||
1063 | select CPU_HAS_PREFETCH | 1061 | select CPU_HAS_PREFETCH |
1064 | select CPU_SUPPORTS_32BIT_KERNEL | 1062 | select CPU_SUPPORTS_32BIT_KERNEL |
1065 | select CPU_SUPPORTS_HIGHMEM | 1063 | select CPU_SUPPORTS_HIGHMEM |
@@ -1073,7 +1071,6 @@ config CPU_MIPS32_R2 | |||
1073 | config CPU_MIPS64_R1 | 1071 | config CPU_MIPS64_R1 |
1074 | bool "MIPS64 Release 1" | 1072 | bool "MIPS64 Release 1" |
1075 | depends on SYS_HAS_CPU_MIPS64_R1 | 1073 | depends on SYS_HAS_CPU_MIPS64_R1 |
1076 | select CPU_HAS_LLSC | ||
1077 | select CPU_HAS_PREFETCH | 1074 | select CPU_HAS_PREFETCH |
1078 | select CPU_SUPPORTS_32BIT_KERNEL | 1075 | select CPU_SUPPORTS_32BIT_KERNEL |
1079 | select CPU_SUPPORTS_64BIT_KERNEL | 1076 | select CPU_SUPPORTS_64BIT_KERNEL |
@@ -1093,7 +1090,6 @@ config CPU_MIPS64_R1 | |||
1093 | config CPU_MIPS64_R2 | 1090 | config CPU_MIPS64_R2 |
1094 | bool "MIPS64 Release 2" | 1091 | bool "MIPS64 Release 2" |
1095 | depends on SYS_HAS_CPU_MIPS64_R2 | 1092 | depends on SYS_HAS_CPU_MIPS64_R2 |
1096 | select CPU_HAS_LLSC | ||
1097 | select CPU_HAS_PREFETCH | 1093 | select CPU_HAS_PREFETCH |
1098 | select CPU_SUPPORTS_32BIT_KERNEL | 1094 | select CPU_SUPPORTS_32BIT_KERNEL |
1099 | select CPU_SUPPORTS_64BIT_KERNEL | 1095 | select CPU_SUPPORTS_64BIT_KERNEL |
@@ -1139,7 +1135,6 @@ config CPU_VR41XX | |||
1139 | config CPU_R4300 | 1135 | config CPU_R4300 |
1140 | bool "R4300" | 1136 | bool "R4300" |
1141 | depends on SYS_HAS_CPU_R4300 | 1137 | depends on SYS_HAS_CPU_R4300 |
1142 | select CPU_HAS_LLSC | ||
1143 | select CPU_SUPPORTS_32BIT_KERNEL | 1138 | select CPU_SUPPORTS_32BIT_KERNEL |
1144 | select CPU_SUPPORTS_64BIT_KERNEL | 1139 | select CPU_SUPPORTS_64BIT_KERNEL |
1145 | help | 1140 | help |
@@ -1148,7 +1143,6 @@ config CPU_R4300 | |||
1148 | config CPU_R4X00 | 1143 | config CPU_R4X00 |
1149 | bool "R4x00" | 1144 | bool "R4x00" |
1150 | depends on SYS_HAS_CPU_R4X00 | 1145 | depends on SYS_HAS_CPU_R4X00 |
1151 | select CPU_HAS_LLSC | ||
1152 | select CPU_SUPPORTS_32BIT_KERNEL | 1146 | select CPU_SUPPORTS_32BIT_KERNEL |
1153 | select CPU_SUPPORTS_64BIT_KERNEL | 1147 | select CPU_SUPPORTS_64BIT_KERNEL |
1154 | help | 1148 | help |
@@ -1158,7 +1152,6 @@ config CPU_R4X00 | |||
1158 | config CPU_TX49XX | 1152 | config CPU_TX49XX |
1159 | bool "R49XX" | 1153 | bool "R49XX" |
1160 | depends on SYS_HAS_CPU_TX49XX | 1154 | depends on SYS_HAS_CPU_TX49XX |
1161 | select CPU_HAS_LLSC | ||
1162 | select CPU_HAS_PREFETCH | 1155 | select CPU_HAS_PREFETCH |
1163 | select CPU_SUPPORTS_32BIT_KERNEL | 1156 | select CPU_SUPPORTS_32BIT_KERNEL |
1164 | select CPU_SUPPORTS_64BIT_KERNEL | 1157 | select CPU_SUPPORTS_64BIT_KERNEL |
@@ -1166,7 +1159,6 @@ config CPU_TX49XX | |||
1166 | config CPU_R5000 | 1159 | config CPU_R5000 |
1167 | bool "R5000" | 1160 | bool "R5000" |
1168 | depends on SYS_HAS_CPU_R5000 | 1161 | depends on SYS_HAS_CPU_R5000 |
1169 | select CPU_HAS_LLSC | ||
1170 | select CPU_SUPPORTS_32BIT_KERNEL | 1162 | select CPU_SUPPORTS_32BIT_KERNEL |
1171 | select CPU_SUPPORTS_64BIT_KERNEL | 1163 | select CPU_SUPPORTS_64BIT_KERNEL |
1172 | help | 1164 | help |
@@ -1175,14 +1167,12 @@ config CPU_R5000 | |||
1175 | config CPU_R5432 | 1167 | config CPU_R5432 |
1176 | bool "R5432" | 1168 | bool "R5432" |
1177 | depends on SYS_HAS_CPU_R5432 | 1169 | depends on SYS_HAS_CPU_R5432 |
1178 | select CPU_HAS_LLSC | ||
1179 | select CPU_SUPPORTS_32BIT_KERNEL | 1170 | select CPU_SUPPORTS_32BIT_KERNEL |
1180 | select CPU_SUPPORTS_64BIT_KERNEL | 1171 | select CPU_SUPPORTS_64BIT_KERNEL |
1181 | 1172 | ||
1182 | config CPU_R5500 | 1173 | config CPU_R5500 |
1183 | bool "R5500" | 1174 | bool "R5500" |
1184 | depends on SYS_HAS_CPU_R5500 | 1175 | depends on SYS_HAS_CPU_R5500 |
1185 | select CPU_HAS_LLSC | ||
1186 | select CPU_SUPPORTS_32BIT_KERNEL | 1176 | select CPU_SUPPORTS_32BIT_KERNEL |
1187 | select CPU_SUPPORTS_64BIT_KERNEL | 1177 | select CPU_SUPPORTS_64BIT_KERNEL |
1188 | select CPU_SUPPORTS_HUGEPAGES | 1178 | select CPU_SUPPORTS_HUGEPAGES |
@@ -1193,7 +1183,6 @@ config CPU_R5500 | |||
1193 | config CPU_R6000 | 1183 | config CPU_R6000 |
1194 | bool "R6000" | 1184 | bool "R6000" |
1195 | depends on EXPERIMENTAL | 1185 | depends on EXPERIMENTAL |
1196 | select CPU_HAS_LLSC | ||
1197 | depends on SYS_HAS_CPU_R6000 | 1186 | depends on SYS_HAS_CPU_R6000 |
1198 | select CPU_SUPPORTS_32BIT_KERNEL | 1187 | select CPU_SUPPORTS_32BIT_KERNEL |
1199 | help | 1188 | help |
@@ -1203,7 +1192,6 @@ config CPU_R6000 | |||
1203 | config CPU_NEVADA | 1192 | config CPU_NEVADA |
1204 | bool "RM52xx" | 1193 | bool "RM52xx" |
1205 | depends on SYS_HAS_CPU_NEVADA | 1194 | depends on SYS_HAS_CPU_NEVADA |
1206 | select CPU_HAS_LLSC | ||
1207 | select CPU_SUPPORTS_32BIT_KERNEL | 1195 | select CPU_SUPPORTS_32BIT_KERNEL |
1208 | select CPU_SUPPORTS_64BIT_KERNEL | 1196 | select CPU_SUPPORTS_64BIT_KERNEL |
1209 | help | 1197 | help |
@@ -1213,7 +1201,6 @@ config CPU_R8000 | |||
1213 | bool "R8000" | 1201 | bool "R8000" |
1214 | depends on EXPERIMENTAL | 1202 | depends on EXPERIMENTAL |
1215 | depends on SYS_HAS_CPU_R8000 | 1203 | depends on SYS_HAS_CPU_R8000 |
1216 | select CPU_HAS_LLSC | ||
1217 | select CPU_HAS_PREFETCH | 1204 | select CPU_HAS_PREFETCH |
1218 | select CPU_SUPPORTS_64BIT_KERNEL | 1205 | select CPU_SUPPORTS_64BIT_KERNEL |
1219 | help | 1206 | help |
@@ -1223,7 +1210,6 @@ config CPU_R8000 | |||
1223 | config CPU_R10000 | 1210 | config CPU_R10000 |
1224 | bool "R10000" | 1211 | bool "R10000" |
1225 | depends on SYS_HAS_CPU_R10000 | 1212 | depends on SYS_HAS_CPU_R10000 |
1226 | select CPU_HAS_LLSC | ||
1227 | select CPU_HAS_PREFETCH | 1213 | select CPU_HAS_PREFETCH |
1228 | select CPU_SUPPORTS_32BIT_KERNEL | 1214 | select CPU_SUPPORTS_32BIT_KERNEL |
1229 | select CPU_SUPPORTS_64BIT_KERNEL | 1215 | select CPU_SUPPORTS_64BIT_KERNEL |
@@ -1234,7 +1220,6 @@ config CPU_R10000 | |||
1234 | config CPU_RM7000 | 1220 | config CPU_RM7000 |
1235 | bool "RM7000" | 1221 | bool "RM7000" |
1236 | depends on SYS_HAS_CPU_RM7000 | 1222 | depends on SYS_HAS_CPU_RM7000 |
1237 | select CPU_HAS_LLSC | ||
1238 | select CPU_HAS_PREFETCH | 1223 | select CPU_HAS_PREFETCH |
1239 | select CPU_SUPPORTS_32BIT_KERNEL | 1224 | select CPU_SUPPORTS_32BIT_KERNEL |
1240 | select CPU_SUPPORTS_64BIT_KERNEL | 1225 | select CPU_SUPPORTS_64BIT_KERNEL |
@@ -1243,7 +1228,6 @@ config CPU_RM7000 | |||
1243 | config CPU_RM9000 | 1228 | config CPU_RM9000 |
1244 | bool "RM9000" | 1229 | bool "RM9000" |
1245 | depends on SYS_HAS_CPU_RM9000 | 1230 | depends on SYS_HAS_CPU_RM9000 |
1246 | select CPU_HAS_LLSC | ||
1247 | select CPU_HAS_PREFETCH | 1231 | select CPU_HAS_PREFETCH |
1248 | select CPU_SUPPORTS_32BIT_KERNEL | 1232 | select CPU_SUPPORTS_32BIT_KERNEL |
1249 | select CPU_SUPPORTS_64BIT_KERNEL | 1233 | select CPU_SUPPORTS_64BIT_KERNEL |
@@ -1253,7 +1237,6 @@ config CPU_RM9000 | |||
1253 | config CPU_SB1 | 1237 | config CPU_SB1 |
1254 | bool "SB1" | 1238 | bool "SB1" |
1255 | depends on SYS_HAS_CPU_SB1 | 1239 | depends on SYS_HAS_CPU_SB1 |
1256 | select CPU_HAS_LLSC | ||
1257 | select CPU_SUPPORTS_32BIT_KERNEL | 1240 | select CPU_SUPPORTS_32BIT_KERNEL |
1258 | select CPU_SUPPORTS_64BIT_KERNEL | 1241 | select CPU_SUPPORTS_64BIT_KERNEL |
1259 | select CPU_SUPPORTS_HIGHMEM | 1242 | select CPU_SUPPORTS_HIGHMEM |
@@ -1673,9 +1656,6 @@ config SB1_PASS_2_1_WORKAROUNDS | |||
1673 | config 64BIT_PHYS_ADDR | 1656 | config 64BIT_PHYS_ADDR |
1674 | bool | 1657 | bool |
1675 | 1658 | ||
1676 | config CPU_HAS_LLSC | ||
1677 | bool | ||
1678 | |||
1679 | config CPU_HAS_SMARTMIPS | 1659 | config CPU_HAS_SMARTMIPS |
1680 | depends on SYS_SUPPORTS_SMARTMIPS | 1660 | depends on SYS_SUPPORTS_SMARTMIPS |
1681 | bool "Support for the SmartMIPS ASE" | 1661 | bool "Support for the SmartMIPS ASE" |