diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 1395ad4..7a8f010 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -174,7 +174,7 @@ config CPU_LOONGSON1B bool "Loongson 1B" depends on SYS_HAS_CPU_LOONGSON1B - select CPU_LOONGSON1 + select CPU_GS232 help The Loongson 1B is a 32-bit SoC, which implements the MIPS32 release 2 instruction set. @@ -235,7 +235,7 @@ endchoice -config CPU_LOONGSON1 +config CPU_GS232 bool select CPU_MIPS32 select CPU_MIPSR2 diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 1c10db5..72b77ad 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -52,7 +52,7 @@ cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) -Wa,-mips32r2 -Wa,--trap cflags-$(CONFIG_CPU_MIPS64_R1) += $(call cc-option,-march=mips64,-mips64 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) -Wa,-mips64 -Wa,--trap cflags-$(CONFIG_CPU_MIPS64_R2) += $(call cc-option,-march=mips64r2,-mips64r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) -Wa,-mips64r2 -Wa,--trap -cflags-$(CONFIG_CPU_LOONGSON1) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) -Wa,-mips32r2 -Wa,--trap +cflags-$(CONFIG_CPU_GS232) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) -Wa,-mips32r2 -Wa,--trap CPPFLAGS += -DTEXT_BASE=$(CONFIG_TEXT_BASE) diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h index e0bb78e..9d94eb3 100644 --- a/arch/mips/include/asm/cpu.h +++ b/arch/mips/include/asm/cpu.h @@ -41,7 +41,7 @@ * These are valid when 23:16 == PRID_COMP_LEGACY */ -#define PRID_IMP_LOONGSON1 0x4200 +#define PRID_IMP_GS232 0x4200 #define PRID_IMP_UNKNOWN 0xff00 @@ -109,7 +109,7 @@ CPU_74K, CPU_BMIPS3300, CPU_JZRISC, - CPU_LOONGSON1, + CPU_GS232, CPU_LAST }; diff --git a/arch/mips/lib/cpu-probe.c b/arch/mips/lib/cpu-probe.c index ddabddd..cbde43a 100644 --- a/arch/mips/lib/cpu-probe.c +++ b/arch/mips/lib/cpu-probe.c @@ -83,10 +83,10 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) { switch (c->processor_id & PRID_IMP_MASK) { - case PRID_IMP_LOONGSON1: + case PRID_IMP_GS232: decode_configs(c); - c->cputype = CPU_LOONGSON1; + c->cputype = CPU_GS232; switch (c->processor_id & PRID_REV_MASK) { case PRID_REV_LOONGSON1B: