Commit be949527 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

configs/qemu: update to the latest kernel/headers version 



Also drop the sparc memset patch, it's upstream as of 3.17.2.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 7cb509b5

board/qemu/sparc-ss10/linux/linux-0001-sparc-memset-fix.patch

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
This makes memset follow the standard (instead of returning 0 on success). This

is needed when certain versions of gcc optimizes around memset calls and assume

that the address argument is preserved in %o0.



Signed-off-by: Andreas Larsson <andreas@gaisler.com>



diff -Nur linux-3.16.2.orig/arch/sparc/lib/memset.S linux-3.16.2/arch/sparc/lib/memset.S

--- linux-3.16.2.orig/arch/sparc/lib/memset.S	2014-09-06 01:37:11.000000000 +0200

+++ linux-3.16.2/arch/sparc/lib/memset.S	2014-09-18 09:53:49.563047773 +0200

@@ -65,6 +65,8 @@

 	.globl	__memset_start, __memset_end

 __memset_start:

 memset:

+	mov	%o0, %g1

+	mov	1, %g4

 	and	%o1, 0xff, %g3

 	sll	%g3, 8, %g2

 	or	%g3, %g2, %g3

@@ -89,6 +91,7 @@

 	 sub	%o0, %o2, %o0

 

 __bzero:

+	clr	%g4

 	mov	%g0, %g3

 1:

 	cmp	%o1, 7

@@ -151,8 +154,8 @@

 	bne,a	8f

 	 EX(stb	%g3, [%o0], and %o1, 1)

 8:

-	retl

-	 clr	%o0

+	b	0f

+	 nop

 7:

 	be	13b

 	 orcc	%o1, 0, %g0

@@ -164,6 +167,12 @@

 	bne	8b

 	 EX(stb	%g3, [%o0 - 1], add %o1, 1)

 0:

+	andcc	%g4, 1, %g0

+	be	5f

+	 nop

+	retl

+	 mov	%g1, %o0

+5:

 	retl

 	 clr	%o0

 __memset_end:

configs/qemu_aarch64_virt_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y 


# Lock to 3.17 headers to avoid breaking with newer kernels

BR2_KERNEL_HEADERS_VERSION=y

BR2_DEFAULT_KERNEL_VERSION="3.17.1"

BR2_DEFAULT_KERNEL_VERSION="3.17.2"

BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y



# Kernel

BR2_LINUX_KERNEL=y

BR2_LINUX_KERNEL_CUSTOM_VERSION=y

BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.1"

BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.2"

BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y

BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-3.17.config"

BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y

configs/qemu_arm_nuri_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y 
# Lock to 3.10 headers to avoid breaking with newer kernels

# Stuck at 3.10.x because there's no Nuri DTS

BR2_KERNEL_HEADERS_VERSION=y

BR2_DEFAULT_KERNEL_VERSION="3.10.58"

BR2_DEFAULT_KERNEL_VERSION="3.10.59"

BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y



# Kernel

BR2_LINUX_KERNEL=y

BR2_LINUX_KERNEL_CUSTOM_VERSION=y

BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.58"

BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.59"

BR2_LINUX_KERNEL_DEFCONFIG="exynos4"

BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_arm_versatile_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ BR2_TARGET_ROOTFS_EXT2=y 


# Lock to 3.17 headers to avoid breaking with newer kernels

BR2_KERNEL_HEADERS_VERSION=y

BR2_DEFAULT_KERNEL_VERSION="3.17.1"

BR2_DEFAULT_KERNEL_VERSION="3.17.2"

BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y



# Kernel

BR2_LINUX_KERNEL=y

BR2_LINUX_KERNEL_CUSTOM_VERSION=y

BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.1"

BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.2"

BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y

BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.17.config"

BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_arm_vexpress_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ BR2_TARGET_ROOTFS_EXT2=y 


# Lock to 3.17 headers to avoid breaking with newer kernels

BR2_KERNEL_HEADERS_VERSION=y

BR2_DEFAULT_KERNEL_VERSION="3.17.1"

BR2_DEFAULT_KERNEL_VERSION="3.17.2"

BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y



# Kernel

BR2_LINUX_KERNEL=y

BR2_LINUX_KERNEL_CUSTOM_VERSION=y

BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.1"

BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.2"

BR2_LINUX_KERNEL_DEFCONFIG="vexpress"

BR2_LINUX_KERNEL_ZIMAGE=y