summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-01-02 20:53:09 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-01-02 20:53:09 +0000
commit032ac3c4cca019c52242d9c16a84d7110eb3bc98 (patch)
tree17cb0bde4b0e8e82ef8e0ce2c73ca7e95b75e08d
parent541bff098ea1ef2c9002b63dd8247cc99b4eade6 (diff)
brcm47xx: fix compile problem when serial is deactivated.
Thank you Andrey git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24885 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm47xx/patches-2.6.36/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch33
-rw-r--r--target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch2
-rw-r--r--target/linux/brcm47xx/patches-2.6.37/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch33
-rw-r--r--target/linux/brcm47xx/patches-2.6.37/400-arch-bcm47xx.patch2
4 files changed, 44 insertions, 26 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.36/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch b/target/linux/brcm47xx/patches-2.6.36/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
index de1e8d12d..ee9ddfc4d 100644
--- a/target/linux/brcm47xx/patches-2.6.36/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
+++ b/target/linux/brcm47xx/patches-2.6.36/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
@@ -24,19 +24,15 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#include <asm/bootinfo.h>
#include <asm/reboot.h>
#include <asm/time.h>
-@@ -168,7 +170,7 @@ static int bcm47xx_get_invariants(struct
-
- void __init plat_mem_setup(void)
- {
-- int err;
-+ int i, err;
- char buf[100];
- struct ssb_mipscore *mcore;
-
-@@ -191,6 +193,24 @@ void __init plat_mem_setup(void)
- }
- }
+@@ -166,6 +168,31 @@ static int bcm47xx_get_invariants(struct
+ return 0;
+ }
++#ifdef CONFIG_SERIAL_8250
++static void __init bcm47xx_early_serial_setup(struct ssb_mipscore *mcore)
++{
++ int i;
++
+ for (i = 0; i < mcore->nr_serial_ports; i++) {
+ struct ssb_serial_port *port = &(mcore->serial_ports[i]);
+ struct uart_port s;
@@ -54,6 +50,19 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ early_serial_setup(&s);
+ }
+ printk(KERN_DEBUG "Serial init done.\n");
++}
++#endif
++
+ void __init plat_mem_setup(void)
+ {
+ int err;
+@@ -191,6 +218,10 @@ void __init plat_mem_setup(void)
+ }
+ }
+
++#ifdef CONFIG_SERIAL_8250
++ bcm47xx_early_serial_setup(mcore);
++#endif
+
_machine_restart = bcm47xx_machine_restart;
_machine_halt = bcm47xx_machine_halt;
diff --git a/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch
index 981bf29f5..abb2044f7 100644
--- a/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch
@@ -33,7 +33,7 @@
+EXPORT_SYMBOL(nvram_get);
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
-@@ -215,3 +215,20 @@ void __init plat_mem_setup(void)
+@@ -226,3 +226,20 @@ void __init plat_mem_setup(void)
_machine_halt = bcm47xx_machine_halt;
pm_power_off = bcm47xx_machine_halt;
}
diff --git a/target/linux/brcm47xx/patches-2.6.37/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch b/target/linux/brcm47xx/patches-2.6.37/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
index de1e8d12d..ee9ddfc4d 100644
--- a/target/linux/brcm47xx/patches-2.6.37/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
@@ -24,19 +24,15 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#include <asm/bootinfo.h>
#include <asm/reboot.h>
#include <asm/time.h>
-@@ -168,7 +170,7 @@ static int bcm47xx_get_invariants(struct
-
- void __init plat_mem_setup(void)
- {
-- int err;
-+ int i, err;
- char buf[100];
- struct ssb_mipscore *mcore;
-
-@@ -191,6 +193,24 @@ void __init plat_mem_setup(void)
- }
- }
+@@ -166,6 +168,31 @@ static int bcm47xx_get_invariants(struct
+ return 0;
+ }
++#ifdef CONFIG_SERIAL_8250
++static void __init bcm47xx_early_serial_setup(struct ssb_mipscore *mcore)
++{
++ int i;
++
+ for (i = 0; i < mcore->nr_serial_ports; i++) {
+ struct ssb_serial_port *port = &(mcore->serial_ports[i]);
+ struct uart_port s;
@@ -54,6 +50,19 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ early_serial_setup(&s);
+ }
+ printk(KERN_DEBUG "Serial init done.\n");
++}
++#endif
++
+ void __init plat_mem_setup(void)
+ {
+ int err;
+@@ -191,6 +218,10 @@ void __init plat_mem_setup(void)
+ }
+ }
+
++#ifdef CONFIG_SERIAL_8250
++ bcm47xx_early_serial_setup(mcore);
++#endif
+
_machine_restart = bcm47xx_machine_restart;
_machine_halt = bcm47xx_machine_halt;
diff --git a/target/linux/brcm47xx/patches-2.6.37/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.37/400-arch-bcm47xx.patch
index 981bf29f5..abb2044f7 100644
--- a/target/linux/brcm47xx/patches-2.6.37/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/400-arch-bcm47xx.patch
@@ -33,7 +33,7 @@
+EXPORT_SYMBOL(nvram_get);
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
-@@ -215,3 +215,20 @@ void __init plat_mem_setup(void)
+@@ -226,3 +226,20 @@ void __init plat_mem_setup(void)
_machine_halt = bcm47xx_machine_halt;
pm_power_off = bcm47xx_machine_halt;
}