diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-07-06 08:08:11 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:31:37 -0400 |
commit | 6e760c8dae7d6c47eff011dd4aad53c94d30494b (patch) | |
tree | 141699aef6e0a3b1fef03ec0c5cc8d8958851078 /arch/mips/Kconfig | |
parent | ca4973dd559b702e265688e724f356d289b8cd67 (diff) |
Rename CONFIG_CPU_MIPS{32,64} to CONFIG_CPU_MIPS{32|64}_R1.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 0ca63e7ce0a7..a4c62c72aa89 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -1050,14 +1050,28 @@ choice | |||
1050 | prompt "CPU type" | 1050 | prompt "CPU type" |
1051 | default CPU_R4X00 | 1051 | default CPU_R4X00 |
1052 | 1052 | ||
1053 | config CPU_MIPS32 | 1053 | config CPU_MIPS32_R1 |
1054 | bool "MIPS32" | 1054 | bool "MIPS32 Release 1" |
1055 | select CPU_SUPPORTS_32BIT_KERNEL | 1055 | select CPU_SUPPORTS_32BIT_KERNEL |
1056 | select CPU_HAS_PREFETCH | ||
1057 | help | ||
1058 | Choose this option to build a kernel for release 1 or later of the | ||
1059 | MIPS32 architecture. Most modern embedded systems with a 32-bit | ||
1060 | MIPS processor are based on a MIPS32 processor. If you know the | ||
1061 | specific type of processor in your system, choose those that one | ||
1062 | otherwise CPU_MIPS32_R1 is a safe bet for any MIPS32 system. | ||
1056 | 1063 | ||
1057 | config CPU_MIPS64 | 1064 | config CPU_MIPS64_R1 |
1058 | bool "MIPS64" | 1065 | bool "MIPS64 Release 1" |
1059 | select CPU_SUPPORTS_32BIT_KERNEL | 1066 | select CPU_SUPPORTS_32BIT_KERNEL |
1060 | select CPU_SUPPORTS_64BIT_KERNEL | 1067 | select CPU_SUPPORTS_64BIT_KERNEL |
1068 | select CPU_HAS_PREFETCH | ||
1069 | help | ||
1070 | Choose this option to build a kernel for release 1 or later of the | ||
1071 | MIPS64 architecture. Many modern embedded systems with a 64-bit | ||
1072 | MIPS processor are based on a MIPS64 processor. If you know the | ||
1073 | specific type of processor in your system, choose those that one | ||
1074 | otherwise CPU_MIPS64_R1 is a safe bet for any MIPS64 system. | ||
1061 | 1075 | ||
1062 | config CPU_R3000 | 1076 | config CPU_R3000 |
1063 | bool "R3000" | 1077 | bool "R3000" |
@@ -1253,7 +1267,7 @@ config SB1_PASS_2_1_WORKAROUNDS | |||
1253 | 1267 | ||
1254 | config 64BIT_PHYS_ADDR | 1268 | config 64BIT_PHYS_ADDR |
1255 | bool "Support for 64-bit physical address space" | 1269 | bool "Support for 64-bit physical address space" |
1256 | depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT | 1270 | depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32_R1 || CPU_MIPS64_R1) && 32BIT |
1257 | 1271 | ||
1258 | config CPU_ADVANCED | 1272 | config CPU_ADVANCED |
1259 | bool "Override CPU Options" | 1273 | bool "Override CPU Options" |
@@ -1276,7 +1290,7 @@ config CPU_HAS_LLSC | |||
1276 | 1290 | ||
1277 | config CPU_HAS_LLDSCD | 1291 | config CPU_HAS_LLDSCD |
1278 | bool "lld/scd Instructions available" if CPU_ADVANCED | 1292 | bool "lld/scd Instructions available" if CPU_ADVANCED |
1279 | default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX && !CPU_MIPS32 | 1293 | default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX && !CPU_MIPS32_R1 |
1280 | help | 1294 | help |
1281 | Say Y here if your CPU has the lld and scd instructions, the 64-bit | 1295 | Say Y here if your CPU has the lld and scd instructions, the 64-bit |
1282 | equivalents of ll and sc. Say Y here for better performance, N if | 1296 | equivalents of ll and sc. Say Y here for better performance, N if |