diff --git a/Config.in.legacy b/Config.in.legacy index 26d489c232..464021fec5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2021.11" +config BR2_BINUTILS_VERSION_CSKY + bool "binutils csky version removed" + select BR2_LEGACY + help + Support for binutils csky version has been removed. + config BR2_GCC_VERSION_CSKY bool "gcc csky version removed" select BR2_LEGACY diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index b4c86dd473..ea1f020989 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -9,7 +9,6 @@ choice prompt "Binutils Version" default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc - default BR2_BINUTILS_VERSION_CSKY if BR2_csky help Select the version of binutils you wish to use. @@ -33,7 +32,6 @@ config BR2_BINUTILS_VERSION_2_36_X config BR2_BINUTILS_VERSION_2_37_X bool "binutils 2.37" - depends on !BR2_csky # https://github.com/uclinux-dev/elf2flt/pull/16 # https://github.com/uclinux-dev/elf2flt/issues/12 depends on !BR2_BINFMT_FLAT @@ -42,16 +40,11 @@ config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc -config BR2_BINUTILS_VERSION_CSKY - bool "binutils csky" - depends on BR2_csky - endchoice config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC - default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY default "2.32" if BR2_BINUTILS_VERSION_2_32_X default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index f543b49940..d1be6cbce8 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -7,9 +7,6 @@ sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz -# Locally calculated (fetched from https://github.com/c-sky/binutils-gdb) -sha512 979552d4b3a4f31e9f3b9a7027321bd4eb3ac6c2d8deac1720e94e54f81d736db09c53c5d87c301010e307b64127e14400a036c7a35e5d63a954a4edd9cc8e2c binutils-c66d8bbcebfddf713b2b436e1b135e6b125a55a5.tar.gz - # locally computed sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 8ec76134bc..bfad25422d 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -21,12 +21,6 @@ BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y endif -ifeq ($(BR2_csky),y) -BINUTILS_SITE = $(call github,c-sky,binutils-gdb,$(BINUTILS_VERSION)) -BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz -BINUTILS_FROM_GIT = y -endif - BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.xz BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))