From 391ef0ab58d7b1510a8f6b6788ee69ae1b384e08 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 31 Oct 2020 14:57:55 +0100 Subject: sh4: migrate to linux 5.4 with latest binutils --- target/config/Config.in.binutils | 1 - target/linux/Config.in.kernelversion | 1 + target/linux/patches/5.4.69/sh4.patch | 11 +++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 target/linux/patches/5.4.69/sh4.patch (limited to 'target') diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index 3170f357a..602a36fc9 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -8,7 +8,6 @@ default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32 default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX 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_32 if ADK_TARGET_ARCH_SH default ADK_TOOLCHAIN_BINUTILS_2_34 if ADK_TARGET_ARCH_BFIN default ADK_TOOLCHAIN_BINUTILS_2_35 diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 61ff9d97f..e641696b4 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -28,6 +28,7 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_CSKY default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_RISCV32 default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_RISCV64 default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_OR1K +default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_SH default ADK_TARGET_LINUX_KERNEL_VERSION_4_19 config ADK_TARGET_LINUX_KERNEL_VERSION_GIT diff --git a/target/linux/patches/5.4.69/sh4.patch b/target/linux/patches/5.4.69/sh4.patch new file mode 100644 index 000000000..8ae79d49d --- /dev/null +++ b/target/linux/patches/5.4.69/sh4.patch @@ -0,0 +1,11 @@ +diff -Nur linux-5.4.69.orig/arch/sh/boot/compressed/vmlinux.scr linux-5.4.69/arch/sh/boot/compressed/vmlinux.scr +--- linux-5.4.69.orig/arch/sh/boot/compressed/vmlinux.scr 2020-10-01 13:19:27.000000000 +0200 ++++ linux-5.4.69/arch/sh/boot/compressed/vmlinux.scr 2020-10-31 07:13:51.213954737 +0100 +@@ -1,6 +1,6 @@ + SECTIONS + { +- .rodata..compressed : { ++ .rodata..compressed : ALIGN(8) { + input_len = .; + LONG(input_data_end - input_data) input_data = .; + *(.data) -- cgit v1.2.3