On 03:10 Sat 21 Mar , Zhang Le wrote:
> This is for future inclusion of Loongson 2F patches. Because Gcc 4.4 (not
> released yet) has different -march argument for these two CPUs, we should
> be able to distinguish them.
Sorry, please hold on. It seems I missed something.
I will send another soon.
>
> Signed-off-by: Zhang Le <r0bertz@gentoo.org>
> ---
> arch/mips/Kconfig | 4 ++--
> arch/mips/Makefile | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index 206cb79..dcb675d 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -1014,8 +1014,8 @@ choice
> prompt "CPU type"
> default CPU_R4X00
>
> -config CPU_LOONGSON2
> - bool "Loongson 2"
> +config CPU_LOONGSON2E
> + bool "Loongson 2E"
> depends on SYS_HAS_CPU_LOONGSON2
> select CPU_SUPPORTS_32BIT_KERNEL
> select CPU_SUPPORTS_64BIT_KERNEL
> diff --git a/arch/mips/Makefile b/arch/mips/Makefile
> index 22dab2e..097a7fa 100644
> --- a/arch/mips/Makefile
> +++ b/arch/mips/Makefile
> @@ -119,7 +119,7 @@ cflags-$(CONFIG_CPU_R4300) += -march=r4300
> -Wa,--trap
> cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap
> cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap
> cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap
> -cflags-$(CONFIG_CPU_LOONGSON2) += -march=r4600 -Wa,--trap
> +cflags-$(CONFIG_CPU_LOONGSON2E) += -march=r4600 -Wa,--trap
> cflags-$(CONFIG_CPU_MIPS32_R1) += $(call
> cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
> -Wa,-mips32 -Wa,--trap
> cflags-$(CONFIG_CPU_MIPS32_R2) += $(call
> cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32)
> \
> --
> 1.6.2
>
|