X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/16afabf47d3f67930f7acef9fff8b449cba9499c..032ac3c4cca019c52242d9c16a84d7110eb3bc98:/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 0d241e656..ee9ddfc4d 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,34 +24,14 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #include <asm/bootinfo.h>
  #include <asm/reboot.h>
  #include <asm/time.h>
-@@ -190,12 +192,47 @@ static int bcm47xx_get_invariants(struct
+@@ -166,6 +168,31 @@ static int bcm47xx_get_invariants(struct
+ 	return 0;
+ }
  
- void __init plat_mem_setup(void)
- {
--	int err;
-+	int i, err;
-+	char buf[100];
-+	struct ssb_mipscore *mcore;
- 
- 	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));
-+		}
-+	}
++#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]);
@@ -70,6 +50,20 @@ 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;
+ 	pm_power_off = bcm47xx_machine_halt;