diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
| commit | 27a5414804f7b8ab41101aad219ebef02d364bde (patch) | |
| tree | c9535dfed260314855b3ba1fe2c75652fdf60a1a /package/binutils/Config.in.host | |
| parent | f6162290fb6800fecffb86eed42069aa0f813f87 (diff) | |
| parent | fc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 (diff) | |
| download | buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.tar.gz buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.zip | |
Merge branch 'next'
Conflicts:
package/gdb/Config.in.host
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/binutils/Config.in.host')
| -rw-r--r-- | package/binutils/Config.in.host | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 15def13081..08540a3d8d 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -4,7 +4,7 @@ choice prompt "Binutils Version" depends on !BR2_arc default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh) - default BR2_BINUTILS_VERSION_2_24 if BR2_microblaze + default BR2_BINUTILS_VERSION_2_24 if BR2_microblaze || BR2_powerpc64le default BR2_BINUTILS_VERSION_2_22 help Select the version of binutils you wish to use. @@ -14,30 +14,30 @@ choice bool "binutils 2.18-avr32-1.0.1" config BR2_BINUTILS_VERSION_2_20_1 - depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze + depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze && !BR2_powerpc64le depends on !BR2_ARM_EABIHF bool "binutils 2.20.1" config BR2_BINUTILS_VERSION_2_21 - depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze + depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze && !BR2_powerpc64le depends on !BR2_ARM_EABIHF bool "binutils 2.21" config BR2_BINUTILS_VERSION_2_21_1 - depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze + depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze && !BR2_powerpc64le depends on !BR2_ARM_EABIHF bool "binutils 2.21.1" config BR2_BINUTILS_VERSION_2_22 - depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze + depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze && !BR2_powerpc64le bool "binutils 2.22" config BR2_BINUTILS_VERSION_2_23_1 - depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze + depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze && !BR2_powerpc64le bool "binutils 2.23.1" config BR2_BINUTILS_VERSION_2_23_2 - depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze + depends on !BR2_avr32 && !BR2_aarch64 && !BR2_microblaze && !BR2_powerpc64le bool "binutils 2.23.2" config BR2_BINUTILS_VERSION_2_24 |
