platform specific patches don't belong here - take #2

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

diff --git a/target/linux/brcm47xx/patches-2.6.34/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch b/target/linux/brcm47xx/patches-2.6.34/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
index cd35d1c..0d241e6 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
@@ -1,27 +1,18 @@
-From 4c6a515310f29c89f25a54a115cde905f97330f8 Mon Sep 17 00:00:00 2001
+From 9be402f069cc259ad5795b77567d66c4e7f6bef6 Mon Sep 17 00:00:00 2001

 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sun, 18 Jul 2010 14:59:24 +0200
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sun, 18 Jul 2010 14:59:24 +0200

-Subject: [PATCH 4/5] MIPS: BCM47xx: Setup and register serial early
+Subject: [PATCH 4/6] MIPS: BCM47xx: Setup and register serial early

 
 Swap the first and second serial if console=ttyS1 was set.
 Set it up and register it for early serial support.
 
 
 Swap the first and second serial if console=ttyS1 was set.
 Set it up and register it for early serial support.
 

+This patch has been in OpenWRT for a long time.
+

 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---

- arch/mips/Kconfig         |    1 -
- arch/mips/bcm47xx/setup.c |   36 +++++++++++++++++++++++++++++++++++-
- 2 files changed, 35 insertions(+), 2 deletions(-)
+ arch/mips/bcm47xx/setup.c |   39 ++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 38 insertions(+), 1 deletions(-)

 
 

---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -65,7 +65,6 @@ config BCM47XX
-       select SSB_B43_PCI_BRIDGE if PCI
-       select SSB_PCICORE_HOSTMODE if PCI
-       select GENERIC_GPIO
--      select SYS_HAS_EARLY_PRINTK
-       select CFE
-       help
-        Support for BCM47XX based boards

 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
 @@ -28,6 +28,8 @@
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
 @@ -28,6 +28,8 @@


@@ -33,7 +24,7 @@ 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>

-@@ -181,12 +183,44 @@ static int bcm47xx_get_invariants(struct
+@@ -190,12 +192,47 @@ static int bcm47xx_get_invariants(struct

  
  void __init plat_mem_setup(void)
  {
  
  void __init plat_mem_setup(void)
  {


@@ -48,15 +39,18 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
                panic("Failed to initialize SSB bus (err %d)\n", err);
 +      mcore = &ssb_bcm47xx.mipscore;
 +
                panic("Failed to initialize SSB bus (err %d)\n", err);
 +      mcore = &ssb_bcm47xx.mipscore;
 +

-+      nvram_getenv("kernel_args", buf, sizeof(buf));
-+      if (!strncmp(buf, "console=ttyS1", 13)) {
-+              struct ssb_serial_port port;
++      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("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));
++                      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++) {
 +      }
 +
 +      for (i = 0; i < mcore->nr_serial_ports; i++) {


@@ -75,7 +69,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +
 +              early_serial_setup(&s);
 +      }
 +
 +              early_serial_setup(&s);
 +      }

-+      printk("Serial init done.\n");
++      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;