hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f
kernel/arch/mips/include/asm/cpu-type.h
....@@ -17,16 +17,16 @@
1717 switch (cpu_type) {
1818 #if defined(CONFIG_SYS_HAS_CPU_LOONGSON2E) || \
1919 defined(CONFIG_SYS_HAS_CPU_LOONGSON2F)
20
- case CPU_LOONGSON2:
20
+ case CPU_LOONGSON2EF:
2121 #endif
2222
23
-#ifdef CONFIG_SYS_HAS_CPU_LOONGSON3
24
- case CPU_LOONGSON3:
23
+#ifdef CONFIG_SYS_HAS_CPU_LOONGSON64
24
+ case CPU_LOONGSON64:
2525 #endif
2626
2727 #if defined(CONFIG_SYS_HAS_CPU_LOONGSON1B) || \
2828 defined(CONFIG_SYS_HAS_CPU_LOONGSON1C)
29
- case CPU_LOONGSON1:
29
+ case CPU_LOONGSON32:
3030 #endif
3131
3232 #ifdef CONFIG_SYS_HAS_CPU_MIPS32_R1
....@@ -38,7 +38,7 @@
3838 #if defined(CONFIG_SYS_HAS_CPU_MIPS32_R1) || \
3939 defined(CONFIG_SYS_HAS_CPU_MIPS32_R2)
4040 case CPU_4KEC:
41
- case CPU_JZRISC:
41
+ case CPU_XBURST:
4242 #endif
4343
4444 #ifdef CONFIG_SYS_HAS_CPU_MIPS32_R2
....@@ -52,13 +52,18 @@
5252 case CPU_M14KEC:
5353 case CPU_INTERAPTIV:
5454 case CPU_PROAPTIV:
55
- case CPU_P5600:
55
+#endif
56
+
57
+#ifdef CONFIG_SYS_HAS_CPU_MIPS32_R5
5658 case CPU_M5150:
59
+ case CPU_P5600:
5760 #endif
5861
5962 #if defined(CONFIG_SYS_HAS_CPU_MIPS32_R2) || \
63
+ defined(CONFIG_SYS_HAS_CPU_MIPS32_R5) || \
6064 defined(CONFIG_SYS_HAS_CPU_MIPS32_R6) || \
6165 defined(CONFIG_SYS_HAS_CPU_MIPS64_R2) || \
66
+ defined(CONFIG_SYS_HAS_CPU_MIPS64_R5) || \
6267 defined(CONFIG_SYS_HAS_CPU_MIPS64_R6)
6368 case CPU_QEMU_GENERIC:
6469 #endif
....@@ -117,11 +122,6 @@
117122 case CPU_VR4181A:
118123 #endif
119124
120
-#ifdef CONFIG_SYS_HAS_CPU_R4300
121
- case CPU_R4300:
122
- case CPU_R4310:
123
-#endif
124
-
125125 #ifdef CONFIG_SYS_HAS_CPU_R4X00
126126 case CPU_R4000PC:
127127 case CPU_R4000SC:
....@@ -144,20 +144,12 @@
144144 case CPU_R5000:
145145 #endif
146146
147
-#ifdef CONFIG_SYS_HAS_CPU_R5432
148
- case CPU_R5432:
149
-#endif
150
-
151147 #ifdef CONFIG_SYS_HAS_CPU_R5500
152148 case CPU_R5500:
153149 #endif
154150
155151 #ifdef CONFIG_SYS_HAS_CPU_NEVADA
156152 case CPU_NEVADA:
157
-#endif
158
-
159
-#ifdef CONFIG_SYS_HAS_CPU_R8000
160
- case CPU_R8000:
161153 #endif
162154
163155 #ifdef CONFIG_SYS_HAS_CPU_R10000