Changeset 24885


Ignore:
Timestamp:
2011-01-02T21:53:09+01:00 (7 years ago)
Author:
hauke
Message:

brcm47xx: fix compile problem when serial is deactivated.

Thank you Andrey

Location:
trunk/target/linux/brcm47xx
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-2.6.36/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch

    r24266 r24885  
    2525 #include <asm/reboot.h> 
    2626 #include <asm/time.h> 
    27 @@ -168,7 +170,7 @@ static int bcm47xx_get_invariants(struct 
     27@@ -166,6 +168,31 @@ static int bcm47xx_get_invariants(struct 
     28        return 0; 
     29 } 
    2830  
    29  void __init plat_mem_setup(void) 
    30  { 
    31 -       int err; 
    32 +       int i, err; 
    33         char buf[100]; 
    34         struct ssb_mipscore *mcore; 
    35   
    36 @@ -191,6 +193,24 @@ void __init plat_mem_setup(void) 
    37                 } 
    38         } 
    39   
     31+#ifdef CONFIG_SERIAL_8250 
     32+static void __init bcm47xx_early_serial_setup(struct ssb_mipscore *mcore) 
     33+{ 
     34+       int i; 
     35+ 
    4036+       for (i = 0; i < mcore->nr_serial_ports; i++) { 
    4137+               struct ssb_serial_port *port = &(mcore->serial_ports[i]); 
     
    5551+       } 
    5652+       printk(KERN_DEBUG "Serial init done.\n"); 
     53+} 
     54+#endif 
     55+ 
     56 void __init plat_mem_setup(void) 
     57 { 
     58        int err; 
     59@@ -191,6 +218,10 @@ void __init plat_mem_setup(void) 
     60                } 
     61        } 
     62  
     63+#ifdef CONFIG_SERIAL_8250 
     64+       bcm47xx_early_serial_setup(mcore); 
     65+#endif 
    5766+ 
    5867        _machine_restart = bcm47xx_machine_restart; 
  • trunk/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch

    r24266 r24885  
    3434--- a/arch/mips/bcm47xx/setup.c 
    3535+++ b/arch/mips/bcm47xx/setup.c 
    36 @@ -215,3 +215,20 @@ void __init plat_mem_setup(void) 
     36@@ -226,3 +226,20 @@ void __init plat_mem_setup(void) 
    3737        _machine_halt = bcm47xx_machine_halt; 
    3838        pm_power_off = bcm47xx_machine_halt; 
  • trunk/target/linux/brcm47xx/patches-2.6.37/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch

    r24162 r24885  
    2525 #include <asm/reboot.h> 
    2626 #include <asm/time.h> 
    27 @@ -168,7 +170,7 @@ static int bcm47xx_get_invariants(struct 
     27@@ -166,6 +168,31 @@ static int bcm47xx_get_invariants(struct 
     28        return 0; 
     29 } 
    2830  
    29  void __init plat_mem_setup(void) 
    30  { 
    31 -       int err; 
    32 +       int i, err; 
    33         char buf[100]; 
    34         struct ssb_mipscore *mcore; 
    35   
    36 @@ -191,6 +193,24 @@ void __init plat_mem_setup(void) 
    37                 } 
    38         } 
    39   
     31+#ifdef CONFIG_SERIAL_8250 
     32+static void __init bcm47xx_early_serial_setup(struct ssb_mipscore *mcore) 
     33+{ 
     34+       int i; 
     35+ 
    4036+       for (i = 0; i < mcore->nr_serial_ports; i++) { 
    4137+               struct ssb_serial_port *port = &(mcore->serial_ports[i]); 
     
    5551+       } 
    5652+       printk(KERN_DEBUG "Serial init done.\n"); 
     53+} 
     54+#endif 
     55+ 
     56 void __init plat_mem_setup(void) 
     57 { 
     58        int err; 
     59@@ -191,6 +218,10 @@ void __init plat_mem_setup(void) 
     60                } 
     61        } 
     62  
     63+#ifdef CONFIG_SERIAL_8250 
     64+       bcm47xx_early_serial_setup(mcore); 
     65+#endif 
    5766+ 
    5867        _machine_restart = bcm47xx_machine_restart; 
  • trunk/target/linux/brcm47xx/patches-2.6.37/400-arch-bcm47xx.patch

    r24162 r24885  
    3434--- a/arch/mips/bcm47xx/setup.c 
    3535+++ b/arch/mips/bcm47xx/setup.c 
    36 @@ -215,3 +215,20 @@ void __init plat_mem_setup(void) 
     36@@ -226,3 +226,20 @@ void __init plat_mem_setup(void) 
    3737        _machine_halt = bcm47xx_machine_halt; 
    3838        pm_power_off = bcm47xx_machine_halt; 
Note: See TracChangeset for help on using the changeset viewer.