From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 2 Jan 2011 20:53:09 +0000 (+0000)
Subject: brcm47xx: fix compile problem when serial is deactivated.
X-Git-Tag: reboot~17933
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d6af00c5554f3cca784d7ce775ad309ec748697b;p=openwrt%2Fstaging%2Flynxis.git

brcm47xx: fix compile problem when serial is deactivated.

Thank you Andrey

SVN-Revision: 24885
---

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 de1e8d12de..ee9ddfc4de 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 981bf29f50..abb2044f78 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 de1e8d12de..ee9ddfc4de 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 981bf29f50..abb2044f78 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;
  }