From 1e60e4f0aa8e9dc5f03d58c8651d98742fdc36b7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 8 Dec 2014 13:00:14 -0600 Subject: bump kernel to 3.14.26 --- .../mikrotik-rb532/patches/3.14.22/rb532-cfgfs.patch | 16 ---------------- .../mips/mikrotik-rb532/patches/3.14.22/rb532-pci.patch | 11 ----------- .../mikrotik-rb532/patches/3.14.26/rb532-cfgfs.patch | 16 ++++++++++++++++ .../mips/mikrotik-rb532/patches/3.14.26/rb532-pci.patch | 11 +++++++++++ 4 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 target/mips/mikrotik-rb532/patches/3.14.22/rb532-cfgfs.patch delete mode 100644 target/mips/mikrotik-rb532/patches/3.14.22/rb532-pci.patch create mode 100644 target/mips/mikrotik-rb532/patches/3.14.26/rb532-cfgfs.patch create mode 100644 target/mips/mikrotik-rb532/patches/3.14.26/rb532-pci.patch (limited to 'target/mips/mikrotik-rb532/patches') diff --git a/target/mips/mikrotik-rb532/patches/3.14.22/rb532-cfgfs.patch b/target/mips/mikrotik-rb532/patches/3.14.22/rb532-cfgfs.patch deleted file mode 100644 index 36ce30d91..000000000 --- a/target/mips/mikrotik-rb532/patches/3.14.22/rb532-cfgfs.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur linux-3.14.5.orig/arch/mips/rb532/devices.c linux-3.14.5/arch/mips/rb532/devices.c ---- linux-3.14.5.orig/arch/mips/rb532/devices.c 2014-05-31 21:34:37.000000000 +0200 -+++ linux-3.14.5/arch/mips/rb532/devices.c 2014-06-04 17:40:36.318731659 +0200 -@@ -191,7 +191,11 @@ - }, { - .name = "rootfs", - .offset = MTDPART_OFS_NXTBLK, -- .size = MTDPART_SIZ_FULL, -+ .size = 108 * 1024 * 1024, -+ }, { -+ .name = "cfgfs", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = 16 * 1024 * 1024, - } - }; - diff --git a/target/mips/mikrotik-rb532/patches/3.14.22/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.14.22/rb532-pci.patch deleted file mode 100644 index adfa652b5..000000000 --- a/target/mips/mikrotik-rb532/patches/3.14.22/rb532-pci.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur linux-3.14.3.orig/arch/mips/pci/pci-rc32434.c linux-3.14.3/arch/mips/pci/pci-rc32434.c ---- linux-3.14.3.orig/arch/mips/pci/pci-rc32434.c 2014-05-06 16:59:58.000000000 +0200 -+++ linux-3.14.3/arch/mips/pci/pci-rc32434.c 2014-05-13 17:15:48.000000000 +0200 -@@ -53,7 +53,6 @@ - .start = 0x50000000, - .end = 0x5FFFFFFF, - .flags = IORESOURCE_MEM, -- .parent = &rc32434_res_pci_mem1, - .sibling = NULL, - .child = &rc32434_res_pci_mem2 - }; diff --git a/target/mips/mikrotik-rb532/patches/3.14.26/rb532-cfgfs.patch b/target/mips/mikrotik-rb532/patches/3.14.26/rb532-cfgfs.patch new file mode 100644 index 000000000..36ce30d91 --- /dev/null +++ b/target/mips/mikrotik-rb532/patches/3.14.26/rb532-cfgfs.patch @@ -0,0 +1,16 @@ +diff -Nur linux-3.14.5.orig/arch/mips/rb532/devices.c linux-3.14.5/arch/mips/rb532/devices.c +--- linux-3.14.5.orig/arch/mips/rb532/devices.c 2014-05-31 21:34:37.000000000 +0200 ++++ linux-3.14.5/arch/mips/rb532/devices.c 2014-06-04 17:40:36.318731659 +0200 +@@ -191,7 +191,11 @@ + }, { + .name = "rootfs", + .offset = MTDPART_OFS_NXTBLK, +- .size = MTDPART_SIZ_FULL, ++ .size = 108 * 1024 * 1024, ++ }, { ++ .name = "cfgfs", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = 16 * 1024 * 1024, + } + }; + diff --git a/target/mips/mikrotik-rb532/patches/3.14.26/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.14.26/rb532-pci.patch new file mode 100644 index 000000000..adfa652b5 --- /dev/null +++ b/target/mips/mikrotik-rb532/patches/3.14.26/rb532-pci.patch @@ -0,0 +1,11 @@ +diff -Nur linux-3.14.3.orig/arch/mips/pci/pci-rc32434.c linux-3.14.3/arch/mips/pci/pci-rc32434.c +--- linux-3.14.3.orig/arch/mips/pci/pci-rc32434.c 2014-05-06 16:59:58.000000000 +0200 ++++ linux-3.14.3/arch/mips/pci/pci-rc32434.c 2014-05-13 17:15:48.000000000 +0200 +@@ -53,7 +53,6 @@ + .start = 0x50000000, + .end = 0x5FFFFFFF, + .flags = IORESOURCE_MEM, +- .parent = &rc32434_res_pci_mem1, + .sibling = NULL, + .child = &rc32434_res_pci_mem2 + }; -- cgit v1.2.3