bcm53xx: rename console fixing patch

This squeezes BCM5301X patches.

SVN-Revision: 42637

diff --git a/target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch b/target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch
new file mode 100644 (file)
index 0000000..5c6f6ec
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch
@@ -0,0 +1,33 @@
+From 310a267714f7565dba8934dd51cdead6adc3b630 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 14 Sep 2014 21:02:35 +0200
+Subject: [PATCH 4/4] ARM: BCM5301X: fix early serial console
+
+This device actually has a 8250 serial with a shift of 0.
+Tested this on a BCM4708.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/arm/Kconfig.debug | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/Kconfig.debug
++++ b/arch/arm/Kconfig.debug
+@@ -109,7 +109,7 @@ choice
+       config DEBUG_BCM_5301X
+               bool "Kernel low-level debugging on BCM5301X UART1"
+               depends on ARCH_BCM_5301X
+-              select DEBUG_UART_PL01X
++              select DEBUG_UART_8250
+ 
+       config DEBUG_BCM_KONA_UART
+               bool "Kernel low-level debugging messages via BCM KONA UART"
+@@ -1132,7 +1132,7 @@ config DEBUG_UART_VIRT
+ config DEBUG_UART_8250_SHIFT
+       int "Register offset shift for the 8250 debug UART"
+       depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
+-      default 0 if FOOTBRIDGE || ARCH_IOP32X
++      default 0 if FOOTBRIDGE || ARCH_IOP32X || DEBUG_BCM_5301X
+       default 2
+ 
+ config DEBUG_UART_8250_WORD

diff --git a/target/linux/bcm53xx/patches-3.14/060-ARM-BCM5301X-fix-early-serial-console.patch b/target/linux/bcm53xx/patches-3.14/060-ARM-BCM5301X-fix-early-serial-console.patch
deleted file mode 100644 (file)
index 5c6f6ec..0000000
--- a/target/linux/bcm53xx/patches-3.14/060-ARM-BCM5301X-fix-early-serial-console.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 310a267714f7565dba8934dd51cdead6adc3b630 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sun, 14 Sep 2014 21:02:35 +0200
-Subject: [PATCH 4/4] ARM: BCM5301X: fix early serial console
-
-This device actually has a 8250 serial with a shift of 0.
-Tested this on a BCM4708.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- arch/arm/Kconfig.debug | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/Kconfig.debug
-+++ b/arch/arm/Kconfig.debug
-@@ -109,7 +109,7 @@ choice
-       config DEBUG_BCM_5301X
-               bool "Kernel low-level debugging on BCM5301X UART1"
-               depends on ARCH_BCM_5301X
--              select DEBUG_UART_PL01X
-+              select DEBUG_UART_8250
- 
-       config DEBUG_BCM_KONA_UART
-               bool "Kernel low-level debugging messages via BCM KONA UART"
-@@ -1132,7 +1132,7 @@ config DEBUG_UART_VIRT
- config DEBUG_UART_8250_SHIFT
-       int "Register offset shift for the 8250 debug UART"
-       depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
--      default 0 if FOOTBRIDGE || ARCH_IOP32X
-+      default 0 if FOOTBRIDGE || ARCH_IOP32X || DEBUG_BCM_5301X
-       default 2
- 
- config DEBUG_UART_8250_WORD