From 1c179ade75adbb5b00dead07e0d6f9d0d1ca402b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 19 Apr 2017 19:39:41 +0200 Subject: linux: update 3.2.x to 3.2.88 --- mk/kernel-ver.mk | 4 ++-- target/config/Config.in.kernelversion | 2 +- target/linux/patches/3.2.83/sparc-aout.patch | 24 ------------------------ target/linux/patches/3.2.88/sparc-aout.patch | 24 ++++++++++++++++++++++++ 4 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 target/linux/patches/3.2.83/sparc-aout.patch create mode 100644 target/linux/patches/3.2.88/sparc-aout.patch diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index c6eebd290..05c640a2e 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -64,10 +64,10 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= c474a1d630357e64ae89f374a2575fa9623e87ea1a97128c4d83f08d4e7a0b4f endif ifeq ($(ADK_TARGET_KERNEL_VERSION_3_2),y) -KERNEL_FILE_VER:= 3.2.83 +KERNEL_FILE_VER:= 3.2.88 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= db578292c43c8cbca7530723d4da4fc784e6cdadc61bff5e966bfb00dbc947e1 +KERNEL_HASH:= 426d254322c521dcb16606d6a390b8600e4f6ccf0edd03bbffc582d6cda1429c endif ifeq ($(ADK_TARGET_KERNEL_VERSION_2_6_32),y) KERNEL_FILE_VER:= 2.6.32.70 diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion index be6fb10ec..9579d96a1 100644 --- a/target/config/Config.in.kernelversion +++ b/target/config/Config.in.kernelversion @@ -160,7 +160,7 @@ config ADK_TARGET_KERNEL_VERSION_3_4_NDS32 depends on ADK_TARGET_ARCH_NDS32 config ADK_TARGET_KERNEL_VERSION_3_2 - bool "3.2.83" + bool "3.2.88" depends on !ADK_TARGET_ARCH_ARC depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_H8300 diff --git a/target/linux/patches/3.2.83/sparc-aout.patch b/target/linux/patches/3.2.83/sparc-aout.patch deleted file mode 100644 index 6ad252479..000000000 --- a/target/linux/patches/3.2.83/sparc-aout.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur linux-3.2.66.orig/arch/sparc/boot/Makefile linux-3.2.66/arch/sparc/boot/Makefile ---- linux-3.2.66.orig/arch/sparc/boot/Makefile 2014-12-31 19:27:54.000000000 -0600 -+++ linux-3.2.66/arch/sparc/boot/Makefile 2015-02-17 13:21:38.269400789 -0600 -@@ -75,9 +75,6 @@ - $(call if_changed,gzip) - @echo ' kernel: $@ is ready' - --$(obj)/vmlinux.aout: vmlinux FORCE -- $(call if_changed,elftoaout) -- @echo ' kernel: $@ is ready' - else - - # The following lines make a readable image for U-Boot. -@@ -110,6 +107,10 @@ - - endif - -+$(obj)/vmlinux.aout: $(obj)/image FORCE -+ $(call if_changed,elftoaout) -+ @echo ' kernel: $@ is ready' -+ - $(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback System.map $(ROOT_IMG) FORCE - $(call if_changed,elftoaout) - $(call if_changed,piggy) diff --git a/target/linux/patches/3.2.88/sparc-aout.patch b/target/linux/patches/3.2.88/sparc-aout.patch new file mode 100644 index 000000000..6ad252479 --- /dev/null +++ b/target/linux/patches/3.2.88/sparc-aout.patch @@ -0,0 +1,24 @@ +diff -Nur linux-3.2.66.orig/arch/sparc/boot/Makefile linux-3.2.66/arch/sparc/boot/Makefile +--- linux-3.2.66.orig/arch/sparc/boot/Makefile 2014-12-31 19:27:54.000000000 -0600 ++++ linux-3.2.66/arch/sparc/boot/Makefile 2015-02-17 13:21:38.269400789 -0600 +@@ -75,9 +75,6 @@ + $(call if_changed,gzip) + @echo ' kernel: $@ is ready' + +-$(obj)/vmlinux.aout: vmlinux FORCE +- $(call if_changed,elftoaout) +- @echo ' kernel: $@ is ready' + else + + # The following lines make a readable image for U-Boot. +@@ -110,6 +107,10 @@ + + endif + ++$(obj)/vmlinux.aout: $(obj)/image FORCE ++ $(call if_changed,elftoaout) ++ @echo ' kernel: $@ is ready' ++ + $(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback System.map $(ROOT_IMG) FORCE + $(call if_changed,elftoaout) + $(call if_changed,piggy) -- cgit v1.2.3