From fdc95fb65694d3178a754ebd62f7a6644146e999 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 19 Feb 2016 17:15:24 +0100 Subject: update older 2.6.x and 3.2.x kernels --- mk/kernel-ver.mk | 12 ++--- target/config/Config.in.kernelversion | 8 +-- target/linux/patches/2.6.32.69/cris-header.patch | 60 ---------------------- .../linux/patches/2.6.32.69/cris-initramfs.patch | 22 -------- target/linux/patches/2.6.32.70/cris-header.patch | 60 ++++++++++++++++++++++ .../linux/patches/2.6.32.70/cris-initramfs.patch | 22 ++++++++ target/linux/patches/3.2.69/sparc-aout.patch | 24 --------- target/linux/patches/3.2.77/sparc-aout.patch | 24 +++++++++ target/mips/systems/qemu-mips | 4 +- 9 files changed, 119 insertions(+), 117 deletions(-) delete mode 100644 target/linux/patches/2.6.32.69/cris-header.patch delete mode 100644 target/linux/patches/2.6.32.69/cris-initramfs.patch create mode 100644 target/linux/patches/2.6.32.70/cris-header.patch create mode 100644 target/linux/patches/2.6.32.70/cris-initramfs.patch delete mode 100644 target/linux/patches/3.2.69/sparc-aout.patch create mode 100644 target/linux/patches/3.2.77/sparc-aout.patch diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 34616fa2b..a044ac493 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -67,15 +67,15 @@ KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= 3bc608bc722755128f14ab4a31b973789e23753d6ac8db417498d0f9911ce7d0 endif -ifeq ($(ADK_TARGET_KERNEL_VERSION_3_2_74),y) -KERNEL_FILE_VER:= 3.2.74 +ifeq ($(ADK_TARGET_KERNEL_VERSION_3_2_77),y) +KERNEL_FILE_VER:= 3.2.77 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 9271c9b72f70cc57a414c8de93e1eeaab48dfd7a2d147d24a116e8f49b17ed75 +KERNEL_HASH:= ce34dac6df719b3bcd99d1380bddf354a0319ae27326a4e10e556a0c5a3df18f endif -ifeq ($(ADK_TARGET_KERNEL_VERSION_2_6_32_69),y) -KERNEL_FILE_VER:= 2.6.32.69 +ifeq ($(ADK_TARGET_KERNEL_VERSION_2_6_32_70),y) +KERNEL_FILE_VER:= 2.6.32.70 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 3412b1ae5e8f7a5266a602fb3022e802091c10595c6ecf4a790214a833bf034d +KERNEL_HASH:= d7d0ee4588711d4f85ed67b65d447b4bbbe215e600a771fb87a62524b6341c43 endif diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion index 1d893d48f..2b758d9c9 100644 --- a/target/config/Config.in.kernelversion +++ b/target/config/Config.in.kernelversion @@ -101,8 +101,8 @@ config ADK_TARGET_KERNEL_VERSION_3_4_110 depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_KERNEL_VERSION_3_4 -config ADK_TARGET_KERNEL_VERSION_3_2_74 - bool "3.2.74" +config ADK_TARGET_KERNEL_VERSION_3_2_77 + bool "3.2.77" depends on !ADK_TARGET_ARCH_ARC depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_H8300 @@ -115,8 +115,8 @@ config ADK_TARGET_KERNEL_VERSION_3_2_74 depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_KERNEL_VERSION_3_2 -config ADK_TARGET_KERNEL_VERSION_2_6_32_69 - bool "2.6.32.69" +config ADK_TARGET_KERNEL_VERSION_2_6_32_70 + bool "2.6.32.70" depends on !ADK_TARGET_ARCH_ARC depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_H8300 diff --git a/target/linux/patches/2.6.32.69/cris-header.patch b/target/linux/patches/2.6.32.69/cris-header.patch deleted file mode 100644 index 1645d519c..000000000 --- a/target/linux/patches/2.6.32.69/cris-header.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -Nur linux-2.6.32.65.orig/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.32.65/arch/cris/include/arch-v10/arch/Kbuild ---- linux-2.6.32.65.orig/arch/cris/include/arch-v10/arch/Kbuild 2014-12-13 15:16:21.000000000 +0100 -+++ linux-2.6.32.65/arch/cris/include/arch-v10/arch/Kbuild 2015-05-20 10:00:19.000000000 +0200 -@@ -1,4 +1,5 @@ - header-y += user.h -+header-y += ptrace.h - header-y += svinto.h - header-y += sv_addr_ag.h - header-y += sv_addr.agh -diff -Nur linux-2.6.32.65.orig/arch/cris/include/arch-v32/arch/Kbuild linux-2.6.32.65/arch/cris/include/arch-v32/arch/Kbuild ---- linux-2.6.32.65.orig/arch/cris/include/arch-v32/arch/Kbuild 2014-12-13 15:16:21.000000000 +0100 -+++ linux-2.6.32.65/arch/cris/include/arch-v32/arch/Kbuild 2015-05-20 10:00:19.000000000 +0200 -@@ -1,2 +1,3 @@ - header-y += user.h -+header-y += ptrace.h - header-y += cryptocop.h -diff -Nur linux-2.6.32.65.orig/arch/cris/include/asm/Kbuild linux-2.6.32.65/arch/cris/include/asm/Kbuild ---- linux-2.6.32.65.orig/arch/cris/include/asm/Kbuild 2014-12-13 15:16:21.000000000 +0100 -+++ linux-2.6.32.65/arch/cris/include/asm/Kbuild 2015-05-20 10:39:33.000000000 +0200 -@@ -1,7 +1,7 @@ - include include/asm-generic/Kbuild.asm - --header-y += arch-v10/ --header-y += arch-v32/ -+header-y += ../arch-v10/arch/ -+header-y += ../arch-v32/arch/ - - header-y += ethernet.h - header-y += rtc.h -diff -Nur linux-2.6.32.65.orig/arch/cris/include/asm/pgtable.h linux-2.6.32.65/arch/cris/include/asm/pgtable.h ---- linux-2.6.32.65.orig/arch/cris/include/asm/pgtable.h 2014-12-13 15:16:21.000000000 +0100 -+++ linux-2.6.32.65/arch/cris/include/asm/pgtable.h 2015-05-20 11:56:24.000000000 +0200 -@@ -14,6 +14,9 @@ - #endif - #include - -+#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ -+ remap_pfn_range(vma, vaddr, pfn, size, prot) -+ - /* - * The Linux memory management assumes a three-level page table setup. On - * CRIS, we use that, but "fold" the mid level into the top-level page -diff -Nur linux-2.6.32.65.orig/include/asm-generic/bug.h linux-2.6.32.65/include/asm-generic/bug.h ---- linux-2.6.32.65.orig/include/asm-generic/bug.h 2014-12-13 15:16:21.000000000 +0100 -+++ linux-2.6.32.65/include/asm-generic/bug.h 2015-05-20 13:39:24.000000000 +0200 -@@ -119,6 +119,14 @@ - }) - #endif - -+#ifndef WARN_RATELIMIT -+#define WARN_RATELIMIT(condition, format...) ({ \ -+ int __ret_warn_on = !!(condition); \ -+ unlikely(__ret_warn_on); \ -+}) -+#endif -+ -+ - #ifndef WARN - #define WARN(condition, format...) ({ \ - int __ret_warn_on = !!(condition); \ diff --git a/target/linux/patches/2.6.32.69/cris-initramfs.patch b/target/linux/patches/2.6.32.69/cris-initramfs.patch deleted file mode 100644 index b709e705e..000000000 --- a/target/linux/patches/2.6.32.69/cris-initramfs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur linux-3.18.12.orig/arch/cris/arch-v10/mm/init.c linux-3.18.12/arch/cris/arch-v10/mm/init.c ---- linux-3.18.12.orig/arch/cris/arch-v10/mm/init.c 2015-04-20 21:48:02.000000000 +0200 -+++ linux-3.18.12/arch/cris/arch-v10/mm/init.c 2015-05-16 01:46:37.000000000 +0200 -@@ -261,3 +261,7 @@ - { - flush_etrax_cacherange(0, 8192); - } -+ -+void free_initrd_mem(unsigned long start, unsigned long end) -+{ -+} -diff -Nur linux-3.18.12.orig/arch/cris/arch-v32/mm/init.c linux-3.18.12/arch/cris/arch-v32/mm/init.c ---- linux-3.18.12.orig/arch/cris/arch-v32/mm/init.c 2015-04-20 21:48:02.000000000 +0200 -+++ linux-3.18.12/arch/cris/arch-v32/mm/init.c 2015-05-16 01:46:54.000000000 +0200 -@@ -171,3 +171,7 @@ - - mem_map = contig_page_data.node_mem_map; - } -+ -+void free_initrd_mem(unsigned long start, unsigned long end) -+{ -+} diff --git a/target/linux/patches/2.6.32.70/cris-header.patch b/target/linux/patches/2.6.32.70/cris-header.patch new file mode 100644 index 000000000..1645d519c --- /dev/null +++ b/target/linux/patches/2.6.32.70/cris-header.patch @@ -0,0 +1,60 @@ +diff -Nur linux-2.6.32.65.orig/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.32.65/arch/cris/include/arch-v10/arch/Kbuild +--- linux-2.6.32.65.orig/arch/cris/include/arch-v10/arch/Kbuild 2014-12-13 15:16:21.000000000 +0100 ++++ linux-2.6.32.65/arch/cris/include/arch-v10/arch/Kbuild 2015-05-20 10:00:19.000000000 +0200 +@@ -1,4 +1,5 @@ + header-y += user.h ++header-y += ptrace.h + header-y += svinto.h + header-y += sv_addr_ag.h + header-y += sv_addr.agh +diff -Nur linux-2.6.32.65.orig/arch/cris/include/arch-v32/arch/Kbuild linux-2.6.32.65/arch/cris/include/arch-v32/arch/Kbuild +--- linux-2.6.32.65.orig/arch/cris/include/arch-v32/arch/Kbuild 2014-12-13 15:16:21.000000000 +0100 ++++ linux-2.6.32.65/arch/cris/include/arch-v32/arch/Kbuild 2015-05-20 10:00:19.000000000 +0200 +@@ -1,2 +1,3 @@ + header-y += user.h ++header-y += ptrace.h + header-y += cryptocop.h +diff -Nur linux-2.6.32.65.orig/arch/cris/include/asm/Kbuild linux-2.6.32.65/arch/cris/include/asm/Kbuild +--- linux-2.6.32.65.orig/arch/cris/include/asm/Kbuild 2014-12-13 15:16:21.000000000 +0100 ++++ linux-2.6.32.65/arch/cris/include/asm/Kbuild 2015-05-20 10:39:33.000000000 +0200 +@@ -1,7 +1,7 @@ + include include/asm-generic/Kbuild.asm + +-header-y += arch-v10/ +-header-y += arch-v32/ ++header-y += ../arch-v10/arch/ ++header-y += ../arch-v32/arch/ + + header-y += ethernet.h + header-y += rtc.h +diff -Nur linux-2.6.32.65.orig/arch/cris/include/asm/pgtable.h linux-2.6.32.65/arch/cris/include/asm/pgtable.h +--- linux-2.6.32.65.orig/arch/cris/include/asm/pgtable.h 2014-12-13 15:16:21.000000000 +0100 ++++ linux-2.6.32.65/arch/cris/include/asm/pgtable.h 2015-05-20 11:56:24.000000000 +0200 +@@ -14,6 +14,9 @@ + #endif + #include + ++#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ ++ remap_pfn_range(vma, vaddr, pfn, size, prot) ++ + /* + * The Linux memory management assumes a three-level page table setup. On + * CRIS, we use that, but "fold" the mid level into the top-level page +diff -Nur linux-2.6.32.65.orig/include/asm-generic/bug.h linux-2.6.32.65/include/asm-generic/bug.h +--- linux-2.6.32.65.orig/include/asm-generic/bug.h 2014-12-13 15:16:21.000000000 +0100 ++++ linux-2.6.32.65/include/asm-generic/bug.h 2015-05-20 13:39:24.000000000 +0200 +@@ -119,6 +119,14 @@ + }) + #endif + ++#ifndef WARN_RATELIMIT ++#define WARN_RATELIMIT(condition, format...) ({ \ ++ int __ret_warn_on = !!(condition); \ ++ unlikely(__ret_warn_on); \ ++}) ++#endif ++ ++ + #ifndef WARN + #define WARN(condition, format...) ({ \ + int __ret_warn_on = !!(condition); \ diff --git a/target/linux/patches/2.6.32.70/cris-initramfs.patch b/target/linux/patches/2.6.32.70/cris-initramfs.patch new file mode 100644 index 000000000..b709e705e --- /dev/null +++ b/target/linux/patches/2.6.32.70/cris-initramfs.patch @@ -0,0 +1,22 @@ +diff -Nur linux-3.18.12.orig/arch/cris/arch-v10/mm/init.c linux-3.18.12/arch/cris/arch-v10/mm/init.c +--- linux-3.18.12.orig/arch/cris/arch-v10/mm/init.c 2015-04-20 21:48:02.000000000 +0200 ++++ linux-3.18.12/arch/cris/arch-v10/mm/init.c 2015-05-16 01:46:37.000000000 +0200 +@@ -261,3 +261,7 @@ + { + flush_etrax_cacherange(0, 8192); + } ++ ++void free_initrd_mem(unsigned long start, unsigned long end) ++{ ++} +diff -Nur linux-3.18.12.orig/arch/cris/arch-v32/mm/init.c linux-3.18.12/arch/cris/arch-v32/mm/init.c +--- linux-3.18.12.orig/arch/cris/arch-v32/mm/init.c 2015-04-20 21:48:02.000000000 +0200 ++++ linux-3.18.12/arch/cris/arch-v32/mm/init.c 2015-05-16 01:46:54.000000000 +0200 +@@ -171,3 +171,7 @@ + + mem_map = contig_page_data.node_mem_map; + } ++ ++void free_initrd_mem(unsigned long start, unsigned long end) ++{ ++} diff --git a/target/linux/patches/3.2.69/sparc-aout.patch b/target/linux/patches/3.2.69/sparc-aout.patch deleted file mode 100644 index 6ad252479..000000000 --- a/target/linux/patches/3.2.69/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.77/sparc-aout.patch b/target/linux/patches/3.2.77/sparc-aout.patch new file mode 100644 index 000000000..6ad252479 --- /dev/null +++ b/target/linux/patches/3.2.77/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) diff --git a/target/mips/systems/qemu-mips b/target/mips/systems/qemu-mips index 898d6959d..462e0c45d 100644 --- a/target/mips/systems/qemu-mips +++ b/target/mips/systems/qemu-mips @@ -1,7 +1,9 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS bool "Qemu Emulator" select ADK_TARGET_QEMU - select ADK_TARGET_KERNEL_VMLINUZ + select ADK_TARGET_KERNEL_VMLINUZ if ADK_TARGET_KERNEL_VERSION_4_4 + select ADK_TARGET_KERNEL_VMLINUZ if ADK_TARGET_KERNEL_VERSION_4_3 + select ADK_TARGET_KERNEL_VMLINUZ if ADK_TARGET_KERNEL_VERSION_4_1 select ADK_TARGET_KERNEL_WITH_COMPRESSION help Qemu support for MIPS architecture. -- cgit v1.2.3