Browse Source

update mpfr, binutils, linux. remove arc specific binutils/gcc

Waldemar Brodkorb 3 years ago
parent
commit
cb9958d31b

+ 2 - 2
mk/linux-ver.mk

@@ -16,10 +16,10 @@ KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y)
-KERNEL_FILE_VER:=	5.4.42
+KERNEL_FILE_VER:=	5.4.53
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		4e431b7c0266a07b76fdb77f8917ad681f0fa34ffba0eb8a172b67f7ef57bc31
+KERNEL_HASH:=		faa7b6f99220d5726f0eaee74a6394f0a3b89be1a75254f3804630211f3d6d21
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y)
 KERNEL_FILE_VER:=	4.19.132

+ 3 - 9
target/config/Config.in.binutils

@@ -3,12 +3,11 @@
 
 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_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
-default ADK_TOOLCHAIN_BINUTILS_2_34
+default ADK_TOOLCHAIN_BINUTILS_2_35
 
 config ADK_TOOLCHAIN_BINUTILS_GIT
 	bool "git"
@@ -16,9 +15,8 @@ config ADK_TOOLCHAIN_BINUTILS_GIT
 	depends on !ADK_TARGET_ARCH_CSKY
 	depends on !ADK_TARGET_ARCH_NDS32
 
-config ADK_TOOLCHAIN_BINUTILS_2_34
-	bool "2.34"
-	depends on !ADK_TARGET_ARCH_ARC
+config ADK_TOOLCHAIN_BINUTILS_2_35
+	bool "2.35"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_CPU_SH_J2
@@ -31,10 +29,6 @@ config ADK_TOOLCHAIN_BINUTILS_2_28
 	bool "2.28"
 	depends on ADK_TARGET_CPU_SH_J2
 
-config ADK_TOOLCHAIN_BINUTILS_ARC
-	bool "arc-2019.03-release"
-	depends on ADK_TARGET_ARCH_ARC
-
 config ADK_TOOLCHAIN_BINUTILS_NDS32
 	bool "nds32-2.30-open"
 	depends on ADK_TARGET_ARCH_NDS32

+ 0 - 7
target/config/Config.in.compiler

@@ -12,7 +12,6 @@ endchoice
 choice
 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_LM32 if ADK_TARGET_ARCH_LM32
 default ADK_TOOLCHAIN_GCC_METAG if ADK_TARGET_ARCH_METAG
@@ -31,7 +30,6 @@ config ADK_TOOLCHAIN_GCC_GIT
 
 config ADK_TOOLCHAIN_GCC_9
 	bool "9.3.0"
-	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_NDS32
@@ -40,7 +38,6 @@ config ADK_TOOLCHAIN_GCC_9
 
 config ADK_TOOLCHAIN_GCC_8
 	bool "8.4.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
@@ -58,10 +55,6 @@ config ADK_TOOLCHAIN_GCC_7
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_OR1K
 
-config ADK_TOOLCHAIN_GCC_ARC
-	bool "arc-2019.03-release"
-	depends on ADK_TARGET_ARCH_ARC
-
 config ADK_TOOLCHAIN_GCC_AVR32
 	bool "4.4.7-avr32"
 	depends on ADK_TARGET_ARCH_AVR32

+ 1 - 1
target/linux/Config.in.kernelversion

@@ -40,7 +40,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_5_4
-	bool "5.4.42"
+	bool "5.4.53"
 	select ADK_TARGET_LINUX_KERNEL_NEW
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN

+ 12 - 0
target/linux/patches/5.4.53/arc.patch

@@ -0,0 +1,12 @@
+diff -Nur linux-4.17.1.orig/arch/arc/boot/Makefile linux-4.17.1/arch/arc/boot/Makefile
+--- linux-4.17.1.orig/arch/arc/boot/Makefile	2018-06-11 22:43:19.000000000 +0200
++++ linux-4.17.1/arch/arc/boot/Makefile	2018-06-16 18:28:02.000000000 +0200
+@@ -7,7 +7,7 @@
+ 
+ OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S
+ 
+-LINUX_START_TEXT = $$(readelf -h vmlinux | \
++LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \
+ 			grep "Entry point address" | grep -o 0x.*)
+ 
+ UIMAGE_LOADADDR    = $(CONFIG_LINUX_LINK_BASE)

+ 26 - 0
target/linux/patches/5.4.53/darwin-dtc.patch

@@ -0,0 +1,26 @@
+diff -Nur linux-4.19.132.orig/scripts/dtc/dtc.h linux-4.19.132/scripts/dtc/dtc.h
+--- linux-4.19.132.orig/scripts/dtc/dtc.h	2020-07-09 09:37:13.000000000 +0200
++++ linux-4.19.132/scripts/dtc/dtc.h	2020-07-15 02:38:00.000000000 +0200
+@@ -33,8 +33,8 @@
+ #include <unistd.h>
+ #include <inttypes.h>
+ 
+-#include <libfdt_env.h>
+-#include <fdt.h>
++#include "libfdt/libfdt_env.h"
++#include "libfdt/fdt.h"
+ 
+ #include "util.h"
+ 
+diff -Nur linux-4.19.132.orig/scripts/dtc/util.c linux-4.19.132/scripts/dtc/util.c
+--- linux-4.19.132.orig/scripts/dtc/util.c	2020-07-09 09:37:13.000000000 +0200
++++ linux-4.19.132/scripts/dtc/util.c	2020-07-15 02:38:18.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ 
+-#include "libfdt.h"
++#include "libfdt/libfdt.h"
+ #include "util.h"
+ #include "version_gen.h"
+ 

+ 0 - 0
target/linux/patches/5.4.42/darwin-file2alias.patch → target/linux/patches/5.4.53/darwin-file2alias.patch


+ 16 - 0
target/linux/patches/5.4.53/dtc-noyaml.patch

@@ -0,0 +1,16 @@
+diff -Nur linux-5.4.53.orig/scripts/dtc/dtc.c linux-5.4.53/scripts/dtc/dtc.c
+--- linux-5.4.53.orig/scripts/dtc/dtc.c	2020-07-22 09:33:18.000000000 +0200
++++ linux-5.4.53/scripts/dtc/dtc.c	2020-07-28 14:20:10.000000000 +0200
+@@ -349,12 +349,6 @@
+ 
+ 	if (streq(outform, "dts")) {
+ 		dt_to_source(outf, dti);
+-#ifndef NO_YAML
+-	} else if (streq(outform, "yaml")) {
+-		if (!streq(inform, "dts"))
+-			die("YAML output format requires dts input format\n");
+-		dt_to_yaml(outf, dti);
+-#endif
+ 	} else if (streq(outform, "dtb")) {
+ 		dt_to_blob(outf, dti, outversion);
+ 	} else if (streq(outform, "asm")) {

+ 0 - 0
target/linux/patches/5.4.42/or1k-more-ram.patch → target/linux/patches/5.4.53/or1k-more-ram.patch


+ 0 - 0
target/linux/patches/5.4.42/relocs.patch → target/linux/patches/5.4.53/relocs.patch


+ 21 - 0
target/linux/patches/5.4.53/startup.patch

@@ -0,0 +1,21 @@
+diff -Nur linux-5.4.53.orig/init/main.c linux-5.4.53/init/main.c
+--- linux-5.4.53.orig/init/main.c	2020-07-22 09:33:18.000000000 +0200
++++ linux-5.4.53/init/main.c	2020-07-28 17:33:28.000000000 +0200
+@@ -1196,6 +1196,8 @@
+ 	if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+ 		pr_err("Warning: unable to open an initial console.\n");
+ 
++	printk(KERN_WARNING "Starting Linux (built with OpenADK).\n");
++
+ 	(void) ksys_dup(0);
+ 	(void) ksys_dup(0);
+ 	/*
+@@ -1204,7 +1206,7 @@
+ 	 */
+ 
+ 	if (!ramdisk_execute_command)
+-		ramdisk_execute_command = "/init";
++		ramdisk_execute_command = "/sbin/init";
+ 
+ 	if (ksys_access((const char __user *)
+ 			ramdisk_execute_command, 0) != 0) {

+ 3 - 10
toolchain/binutils/Makefile.inc

@@ -2,10 +2,10 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		binutils
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_34),y)
-PKG_VERSION:=		2.34
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_35),y)
+PKG_VERSION:=		2.35
 PKG_RELEASE:=		1
-PKG_HASH:=		f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
+PKG_HASH:=		1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85
 PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 endif
@@ -23,13 +23,6 @@ PKG_HASH:=		cd717966fc761d840d451dbd58d44e1e5b92949d2073d75b73fccb476d772fcf
 PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_ARC),y)
-PKG_VERSION:=		arc-2019.03-release
-PKG_GIT:=		tag
-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_NDS32),y)
 PKG_VERSION:=		nds32-binutils-2.30-branch-open
 PKG_GIT:=		branch

+ 0 - 7
toolchain/gcc/Makefile.inc

@@ -26,13 +26,6 @@ PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 LIBSTDCXXVER:=		23
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_ARC),y)
-PKG_VERSION:=		arc-2019.03-release
-PKG_GIT:=		tag
-PKG_SITES:=		https://github.com/foss-for-synopsys-dwc-arc-processors/gcc.git
-PKG_RELEASE:=		1
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-endif
 ifeq ($(ADK_TOOLCHAIN_GCC_AVR32),y)
 PKG_VERSION:=		4.4.7
 PKG_HASH:=		76ad7c433af1c798a1e116c4dfa8f5f794f0d32bff65f88c54dcd5e5d146fc32

+ 2 - 2
toolchain/mpfr/Makefile.inc

@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		mpfr
-PKG_VERSION:=		4.0.1
+PKG_VERSION:=		4.1.0
 PKG_RELEASE:=		1
-PKG_HASH:=		67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e
+PKG_HASH:=		0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
 PKG_SITES:=		http://www.mpfr.org/mpfr-current/