[package] busybox: implement ms static routes option in udhcpc (#6435)

[openwrt.git] / target / linux / brcm47xx / patches-2.6.37 / 014-MIPS-BCM47xx-Setup-and-register-serial-early.patch

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 0d241e6..de1e8d1 100644 (file)
--- 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,35 +24,19 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #include <asm/bootinfo.h>
  #include <asm/reboot.h>
  #include <asm/time.h>
  #include <asm/bootinfo.h>
  #include <asm/reboot.h>
  #include <asm/time.h>

-@@ -190,12 +192,47 @@ static int bcm47xx_get_invariants(struct
+@@ -168,7 +170,7 @@ static int bcm47xx_get_invariants(struct

  
  void __init plat_mem_setup(void)
  {
 -      int err;
 +      int i, err;
  
  void __init plat_mem_setup(void)
  {
 -      int err;
 +      int i, err;

-+      char buf[100];
-+      struct ssb_mipscore *mcore;
+       char buf[100];
+       struct ssb_mipscore *mcore;
+ 
+@@ -191,6 +193,24 @@ void __init plat_mem_setup(void)
+               }
+       }

  
  

-       err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
-                                     bcm47xx_get_invariants);
-       if (err)
-               panic("Failed to initialize SSB bus (err %d)\n", err);
-+      mcore = &ssb_bcm47xx.mipscore;
-+
-+      if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0 ||
-+          cfe_getenv("kernel_args", buf, sizeof(buf)) >= 0) {
-+              if (strstr(buf, "console=ttyS1")) {
-+                      struct ssb_serial_port port;
-+
-+                      printk(KERN_DEBUG "Swapping serial ports!\n");
-+                      /* swap serial ports */
-+                      memcpy(&port, &mcore->serial_ports[0], sizeof(port));
-+                      memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1],
-+                             sizeof(port));
-+                      memcpy(&mcore->serial_ports[1], &port, sizeof(port));
-+              }
-+      }
-+

 +      for (i = 0; i < mcore->nr_serial_ports; i++) {
 +              struct ssb_serial_port *port = &(mcore->serial_ports[i]);
 +              struct uart_port s;
 +      for (i = 0; i < mcore->nr_serial_ports; i++) {
 +              struct ssb_serial_port *port = &(mcore->serial_ports[i]);
 +              struct uart_port s;


@@ -70,6 +54,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +              early_serial_setup(&s);
 +      }
 +      printk(KERN_DEBUG "Serial init done.\n");
 +              early_serial_setup(&s);
 +      }
 +      printk(KERN_DEBUG "Serial init done.\n");

- 
++

        _machine_restart = bcm47xx_machine_restart;
        _machine_halt = bcm47xx_machine_halt;
        _machine_restart = bcm47xx_machine_restart;
        _machine_halt = bcm47xx_machine_halt;

+       pm_power_off = bcm47xx_machine_halt;