From 55a37eaa911437352c8b5ad7b7bd9cc9160229ce Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:56 +0100 Subject: [PATCH] MIPS: add support for M5101 cores -march=m5101 support starts from GCC-6, so disable previous versions when selecting this core. Note that M5101 implies a MIPS R5 CPU, and some GCC versions are already disabled for R5, so we don't need to disable those ones for M5101 as well. Also disable external toolchains that don't support this core. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 5 +++++ package/gcc/Config.in.host | 3 ++- toolchain/toolchain-external/Config.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 9ed42a2580..3881909f76 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -51,6 +51,10 @@ config BR2_mips_m5100 bool "M5100" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R5 +config BR2_mips_m5101 + bool "M5101" + depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R5 config BR2_mips_64 bool "Generic MIPS64" depends on BR2_ARCH_IS_64 @@ -114,6 +118,7 @@ config BR2_GCC_TARGET_ARCH default "mips32r6" if BR2_mips_32r6 default "interaptiv" if BR2_mips_interaptiv default "m5100" if BR2_mips_m5100 + default "m5101" if BR2_mips_m5101 default "mips64" if BR2_mips_64 default "mips64r2" if BR2_mips_64r2 default "mips64r5" if BR2_mips_64r5 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 2d853879c3..15b23dbeeb 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -100,7 +100,8 @@ choice # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5100 + depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && \ + !BR2_mips_m5101 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_GCC_NEEDS_MPC diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 254a1e5c94..62c2cd21b2 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -598,7 +598,7 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS BR2_x86_64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5100 + depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && !BR2_mips_m5101 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 select BR2_TOOLCHAIN_EXTERNAL_MUSL -- 2.30.2