From f2c590368753f0d16ae1954ac43940a4d7866faa Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 3 Sep 2017 19:42:41 +0200 Subject: [PATCH] riscv: use glibc 2.26 branch and latest git sources for linux kernel --- target/config/Config.in.kernelversion | 12 +++++------- toolchain/glibc/Makefile.inc | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion index c881bdd89..979817812 100644 --- a/target/config/Config.in.kernelversion +++ b/target/config/Config.in.kernelversion @@ -11,10 +11,11 @@ default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_KINETIS_K70 default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_ADSP_BF537 default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_CSKY default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_LM32 +default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_RISCV32 +default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_RISCV64 default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU -default ADK_TARGET_KERNEL_VERSION_4_6 if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64 default ADK_TARGET_KERNEL_VERSION_4_13 if ADK_TARGET_SYSTEM_ORANGE_PI0 default ADK_TARGET_KERNEL_VERSION_4_9 @@ -22,8 +23,6 @@ config ADK_TARGET_KERNEL_VERSION_GIT bool "git" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 @@ -63,10 +62,6 @@ config ADK_TARGET_KERNEL_VERSION_4_9 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 -config ADK_TARGET_KERNEL_VERSION_4_6 - bool "4.6.2" - depends on ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64 - config ADK_TARGET_KERNEL_VERSION_4_4 bool "4.4.79" depends on !ADK_TARGET_ARCH_CSKY @@ -238,6 +233,7 @@ config ADK_TARGET_KERNEL_GIT_REPO default "https://github.com/beagleboard/linux.git" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "https://github.com/m-labs/linux-milkymist.git" if ADK_TARGET_ARCH_LM32 default "https://github.com/c-sky/linux-4.9.y.git" if ADK_TARGET_ARCH_CSKY + default "https://github.com/riscv/riscv-linux.git" if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64 default "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" help GIT repository to use. @@ -253,6 +249,7 @@ config ADK_TARGET_KERNEL_GIT_REPO_NAME default "bb" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "lm32" if ADK_TARGET_ARCH_LM32 default "csky" if ADK_TARGET_ARCH_CSKY + default "riscv" if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64 default "linus" config ADK_TARGET_KERNEL_GIT @@ -262,6 +259,7 @@ config ADK_TARGET_KERNEL_GIT default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537 default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32 default "314c498ddc8c43a66ca96ff3af7da98e10fa1cc6" if ADK_TARGET_ARCH_CSKY + default "1cd2e072bbd1a518e11b551435be0ad84a2c52af" if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64 default "1d008423ab5fd12459f53342e4d17585ec63cfe4" if ADK_TARGET_SYSTEM_KINETIS_K70 default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG default "c85fbc86c61a8c8fd45ab1fe3d1bdd2df12f7962" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index aca3b78d2..16355c05a 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} PKG_HASH:= e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd endif ifeq ($(ADK_TARGET_LIB_GLIBC_RISCV),y) -PKG_VERSION:= riscv-next +PKG_VERSION:= riscv-glibc-2.26 PKG_RELEASE:= 1 PKG_GIT:= branch PKG_SITES:= https://github.com/riscv/riscv-glibc.git -- 2.11.4.GIT