[Buildroot] [PATCH] toolchain-external/CodeSourcery MIPS: available only for R2

[Buildroot] [PATCH] toolchain-external/CodeSourcery MIPS: available only for R2

[Vicente Olivert Riera]

Currently the CodeSourcery toolchains for MIPS can be selected to build
mips32 (revision level 1) targets, but the resulting binaries are built
for mips32r2 instead. This is because these toolchains don't have
library support other than mips32r2, so there is no point to allow the
selection of a mips32 variant with a CodeSourcery MIPS toolchain, since
everything will be built for mips32r2 instead.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 toolchain/toolchain-external/Config.in |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 18eb784..4291394 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -193,11 +193,10 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201505
 	bool "Sourcery CodeBench MIPS 2015.05"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	depends on BR2_mips_32r2 || BR2_mips_64r2
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on !BR2_MIPS_NABI32
 	depends on !BR2_STATIC_LIBS
-	# Unsupported for MIPS R6
-	depends on !BR2_mips_32r6 && !BR2_mips_64r6
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -281,11 +280,10 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201505
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201411
 	bool "Sourcery CodeBench MIPS 2014.11"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	depends on BR2_mips_32r2 || BR2_mips_64r2
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on !BR2_MIPS_NABI32
 	depends on !BR2_STATIC_LIBS
-	# Unsupported for MIPS R6
-	depends on !BR2_mips_32r6 && !BR2_mips_64r6
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -369,11 +367,10 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201411
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201405
 	bool "Sourcery CodeBench MIPS 2014.05"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	depends on BR2_mips_32r2 || BR2_mips_64r2
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on !BR2_MIPS_NABI32
 	depends on !BR2_STATIC_LIBS
-	# Unsupported for MIPS R6
-	depends on !BR2_mips_32r6 && !BR2_mips_64r6
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
-- 
1.7.1

[Buildroot] [PATCH buildroot-test] Update CodeSourcery MIPS toolchains config files

[Vicente Olivert Riera]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 web/toolchains/configs/sourcery-mips.config   |    1 +
 web/toolchains/configs/sourcery-mips64.config |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/web/toolchains/configs/sourcery-mips.config b/web/toolchains/configs/sourcery-mips.config
index 7ecf03b..a49fe70 100644
--- a/web/toolchains/configs/sourcery-mips.config
+++ b/web/toolchains/configs/sourcery-mips.config
@@ -1,3 +1,4 @@
 BR2_mips=y
+BR2_mips_32r2=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201505=y
diff --git a/web/toolchains/configs/sourcery-mips64.config b/web/toolchains/configs/sourcery-mips64.config
index 987cf85..d89af1c 100644
--- a/web/toolchains/configs/sourcery-mips64.config
+++ b/web/toolchains/configs/sourcery-mips64.config
@@ -1,4 +1,5 @@
 BR2_mips64el=y
-BR2_mips_4=y
+BR2_mips_64r2=y
 BR2_MIPS_NABI64=y
 BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201505=y
-- 
1.7.1

[Buildroot] [PATCH buildroot-test] Update CodeSourcery MIPS toolchains config files

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Fri, 16 Oct 2015 17:00:02 +0100, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  web/toolchains/configs/sourcery-mips.config   |    1 +
>  web/toolchains/configs/sourcery-mips64.config |    3 ++-
>  2 files changed, 3 insertions(+), 1 deletions(-)

Applied to buildroot-test, and deployed on the server. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH] toolchain-external/CodeSourcery MIPS: available only for R2

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Fri, 16 Oct 2015 17:00:01 +0100, Vicente Olivert Riera wrote:
> Currently the CodeSourcery toolchains for MIPS can be selected to build
> mips32 (revision level 1) targets, but the resulting binaries are built
> for mips32r2 instead. This is because these toolchains don't have
> library support other than mips32r2, so there is no point to allow the
> selection of a mips32 variant with a CodeSourcery MIPS toolchain, since
> everything will be built for mips32r2 instead.
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  toolchain/toolchain-external/Config.in |    9 +++------
>  1 files changed, 3 insertions(+), 6 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com