diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-01-02 20:53:09 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-01-02 20:53:09 +0000 |
| commit | d6af00c5554f3cca784d7ce775ad309ec748697b (patch) | |
| tree | 917b1dce7b5ce54ab0c88dd87b67b9f270cd7cc0 /target/linux | |
| parent | 4b8799280fe688cfe8221b2b95eaaaddb122d550 (diff) | |
| download | upstream-d6af00c5554f3cca784d7ce775ad309ec748697b.tar.gz upstream-d6af00c5554f3cca784d7ce775ad309ec748697b.tar.bz2 upstream-d6af00c5554f3cca784d7ce775ad309ec748697b.zip | |
brcm47xx: fix compile problem when serial is deactivated.
Thank you Andrey
SVN-Revision: 24885
Diffstat (limited to 'target/linux')
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 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; } |