From b224cf732599fa4963b372cb89c4a25978510d31 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Jul 2014 12:07:20 +0200
Subject: bump to 3.15.4

---
 .../mips/mikrotik-rb532/patches/3.15.2/rb532-cfgfs.patch | 16 ----------------
 .../mikrotik-rb532/patches/3.15.2/rb532-serial.patch     | 15 ---------------
 .../mips/mikrotik-rb532/patches/3.15.4/rb532-cfgfs.patch | 16 ++++++++++++++++
 .../mikrotik-rb532/patches/3.15.4/rb532-serial.patch     | 15 +++++++++++++++
 4 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 target/mips/mikrotik-rb532/patches/3.15.2/rb532-cfgfs.patch
 delete mode 100644 target/mips/mikrotik-rb532/patches/3.15.2/rb532-serial.patch
 create mode 100644 target/mips/mikrotik-rb532/patches/3.15.4/rb532-cfgfs.patch
 create mode 100644 target/mips/mikrotik-rb532/patches/3.15.4/rb532-serial.patch

(limited to 'target/mips/mikrotik-rb532')

diff --git a/target/mips/mikrotik-rb532/patches/3.15.2/rb532-cfgfs.patch b/target/mips/mikrotik-rb532/patches/3.15.2/rb532-cfgfs.patch
deleted file mode 100644
index 36ce30d91..000000000
--- a/target/mips/mikrotik-rb532/patches/3.15.2/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.15.2/rb532-serial.patch b/target/mips/mikrotik-rb532/patches/3.15.2/rb532-serial.patch
deleted file mode 100644
index 6c6951895..000000000
--- a/target/mips/mikrotik-rb532/patches/3.15.2/rb532-serial.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c linux-3.15-rc5/drivers/tty/serial/serial_core.c
---- linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c	2014-05-09 22:10:52.000000000 +0200
-+++ linux-3.15-rc5/drivers/tty/serial/serial_core.c	2014-05-20 10:30:52.000000000 +0200
-@@ -2686,9 +2686,10 @@
- 
- 	/*
- 	 * If the port is used as a console, unregister it
--	 */
-+ 	 * DISABLE: breaks serial console on rb532
- 	if (uart_console(uport))
- 		unregister_console(uport->cons);
-+	 */
- 
- 	/*
- 	 * Free the port IO and memory resources, if any.
diff --git a/target/mips/mikrotik-rb532/patches/3.15.4/rb532-cfgfs.patch b/target/mips/mikrotik-rb532/patches/3.15.4/rb532-cfgfs.patch
new file mode 100644
index 000000000..36ce30d91
--- /dev/null
+++ b/target/mips/mikrotik-rb532/patches/3.15.4/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.15.4/rb532-serial.patch b/target/mips/mikrotik-rb532/patches/3.15.4/rb532-serial.patch
new file mode 100644
index 000000000..6c6951895
--- /dev/null
+++ b/target/mips/mikrotik-rb532/patches/3.15.4/rb532-serial.patch
@@ -0,0 +1,15 @@
+diff -Nur linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c linux-3.15-rc5/drivers/tty/serial/serial_core.c
+--- linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c	2014-05-09 22:10:52.000000000 +0200
++++ linux-3.15-rc5/drivers/tty/serial/serial_core.c	2014-05-20 10:30:52.000000000 +0200
+@@ -2686,9 +2686,10 @@
+ 
+ 	/*
+ 	 * If the port is used as a console, unregister it
+-	 */
++ 	 * DISABLE: breaks serial console on rb532
+ 	if (uart_console(uport))
+ 		unregister_console(uport->cons);
++	 */
+ 
+ 	/*
+ 	 * Free the port IO and memory resources, if any.
-- 
cgit v1.2.3