c-sky: use gcc/binutils/linux/glibc upstream

8 files changed, 16 insertions, 29 deletions

diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index 93796e241..275452933 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -15,6 +15,12 @@ KERNEL_FILE_VER:=	$(ADK_TARGET_LINUX_KERNEL_GIT)
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
 endif
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_3),y)
+KERNEL_FILE_VER:=	5.3.1
+KERNEL_RELEASE:=	1
+KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
+KERNEL_HASH:=		9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858
+endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y)
 KERNEL_FILE_VER:=	4.19.75
 KERNEL_RELEASE:=	1
diff --git a/mk/linux.mk b/mk/linux.mk
index 037b48cbd..37f7b8684 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -9,7 +9,8 @@ PKG_GIT:=	$(ADK_TARGET_LINUX_KERNEL_GIT_TYPE)
 PKG_SITES:=	$(ADK_TARGET_LINUX_KERNEL_GIT_REPO)
 else
 PKG_VERSION:=	$(KERNEL_FILE_VER)
-PKG_SITES:=  	${MASTER_SITE_KERNEL:=kernel/v4.x/} \
+PKG_SITES:=  	${MASTER_SITE_KERNEL:=kernel/v5.x/} \
+		${MASTER_SITE_KERNEL:=kernel/v4.x/} \
 		${MASTER_SITE_KERNEL:=kernel/v3.x/} \
 		${MASTER_SITE_KERNEL:=kernel/v3.0/testing/} \
 		${MASTER_SITE_KERNEL:=kernel/v4.x/testing/} \
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index a91bda51f..d07434242 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -5,7 +5,6 @@ choice
 prompt "Binutils version"
 default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_ARCH_ARC
 default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32
-default ADK_TOOLCHAIN_BINUTILS_CSKY if ADK_TARGET_ARCH_CSKY
 default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32
 default ADK_TOOLCHAIN_BINUTILS_2_28 if ADK_TARGET_CPU_SH_J2
 default ADK_TOOLCHAIN_BINUTILS_2_29 if ADK_TARGET_ARCH_CRIS
@@ -21,7 +20,6 @@ config ADK_TOOLCHAIN_BINUTILS_2_32
 	bool "2.32"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_CSKY
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_CPU_SH_J2
 
@@ -41,10 +39,6 @@ config ADK_TOOLCHAIN_BINUTILS_NDS32
 	bool "nds32-2.30-open"
 	depends on ADK_TARGET_ARCH_NDS32
 
-config ADK_TOOLCHAIN_BINUTILS_CSKY
-	bool "2.27-csky"
-	depends on ADK_TARGET_ARCH_CSKY
-
 config ADK_TOOLCHAIN_BINUTILS_AVR32
 	bool "2.20.1-avr32"
 	depends on ADK_TARGET_ARCH_AVR32
diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler
index d00836b0a..73173e2ed 100644
--- a/target/config/Config.in.compiler
+++ b/target/config/Config.in.compiler
@@ -31,7 +31,6 @@ prompt "GCC version"
 depends on ADK_BUILD_COMPILER_GCC
 default ADK_TOOLCHAIN_GCC_ARC if ADK_TARGET_ARCH_ARC
 default ADK_TOOLCHAIN_GCC_AVR32 if ADK_TARGET_ARCH_AVR32
-default ADK_TOOLCHAIN_GCC_CSKY if ADK_TARGET_ARCH_CSKY
 default ADK_TOOLCHAIN_GCC_METAG if ADK_TARGET_ARCH_METAG
 default ADK_TOOLCHAIN_GCC_NDS32 if ADK_TARGET_ARCH_NDS32
 default ADK_TOOLCHAIN_GCC_OR1K if ADK_TARGET_ARCH_OR1K
@@ -48,7 +47,6 @@ config ADK_TOOLCHAIN_GCC_9
 	bool "9.2.0"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_CSKY
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_NDS32
 
@@ -78,10 +76,6 @@ config ADK_TOOLCHAIN_GCC_AVR32
 	bool "4.4.7-avr32"
 	depends on ADK_TARGET_ARCH_AVR32
 
-config ADK_TOOLCHAIN_GCC_CSKY
-	bool "6.3.0-csky"
-	depends on ADK_TARGET_ARCH_CSKY
-
 config ADK_TOOLCHAIN_GCC_METAG
 	bool "4.2.4-metag"
 	depends on ADK_TARGET_ARCH_METAG
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 57041f360..372a9e2e2 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -12,7 +12,6 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARF
 default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_KINETIS_K70
 default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_ADSP_BF537
 default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_PHYTEC_WEGA
-default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_CSKY
 default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_LM32
 default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_RISCV32
 default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_RISCV64
@@ -33,6 +32,13 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 
+config ADK_TARGET_LINUX_KERNEL_VERSION_5_3
+	bool "5.3.1"
+	select ADK_TARGET_LINUX_KERNEL_NEW
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_CRIS
+	depends on !ADK_TARGET_ARCH_METAG
+
 config ADK_TARGET_LINUX_KERNEL_VERSION_4_19
 	bool "4.19.75"
 	select ADK_TARGET_LINUX_KERNEL_NEW
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc
index f9d589ace..c60973685 100644
--- a/toolchain/binutils/Makefile.inc
+++ b/toolchain/binutils/Makefile.inc
@@ -30,13 +30,6 @@ PKG_RELEASE:=		1
 PKG_SITES:=		https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb.git
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_CSKY),y)
-PKG_VERSION:=		binutils-2_27-branch-csky
-PKG_GIT:=		branch
-PKG_RELEASE:=		1
-PKG_SITES:=		https://github.com/c-sky/binutils-gdb.git
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-endif
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_NDS32),y)
 PKG_VERSION:=		nds32-binutils-2.30-branch-open
 PKG_GIT:=		branch
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 1d6088d85..cf5546831 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -41,13 +41,6 @@ PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 LIBSTDCXXVER:=		19
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_CSKY),y)
-PKG_VERSION:=		gcc-6-branch-csky
-PKG_GIT:=		branch
-PKG_SITES:=		https://github.com/c-sky/gcc.git
-PKG_RELEASE:=		1
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-endif
 ifeq ($(ADK_TOOLCHAIN_GCC_METAG),y)
 PKG_VERSION:=		4.2.4
 PKG_HASH:=		7cb75c5183bd18f415860084440377016dc78feeee2852227b831f2e4fcaa5d6
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 0fef6a892..a9411cd5d 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -13,6 +13,6 @@ PKG_VERSION:=		2.30
 PKG_GLIBCVER:=		2.30
 PKG_RELEASE:=		1
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
-PKG_HASH:=		b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082
+PKG_HASH:=		e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
 endif
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz