diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-01-02 20:53:09 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-01-02 20:53:09 +0000 |
| commit | 3d3c17497e9c02ab48874fb19f68188a2a68d3fd (patch) | |
| tree | 17cb0bde4b0e8e82ef8e0ce2c73ca7e95b75e08d /target/linux/brcm47xx/patches-2.6.37/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch | |
| parent | c97b524b656511911853a6780cfdb3432793e4c8 (diff) | |
| download | upstream-3d3c17497e9c02ab48874fb19f68188a2a68d3fd.tar.gz upstream-3d3c17497e9c02ab48874fb19f68188a2a68d3fd.tar.bz2 upstream-3d3c17497e9c02ab48874fb19f68188a2a68d3fd.zip | |
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
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.37/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.37/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch | 33 |
1 files changed, 21 insertions, 12 deletions
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; |