aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.35/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-07-31 10:05:29 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-07-31 10:05:29 +0000
commit96911f6b586e468d4524785a7b2e396379ff92de (patch)
tree14d48c9fe570ab55037e68525aab70cde4cdc03f /target/linux/brcm47xx/patches-2.6.35/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
parent927d42ed6245933b429124deede788510a3b10df (diff)
downloadupstream-96911f6b586e468d4524785a7b2e396379ff92de.tar.gz
upstream-96911f6b586e468d4524785a7b2e396379ff92de.tar.bz2
upstream-96911f6b586e468d4524785a7b2e396379ff92de.zip
brcm47xx: some fixes
* fix return codes of nvram_getenv. Now it behaves like cfe_getenv. * also check cfe for kernel_args param. * some style fixes SVN-Revision: 22424
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.35/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.35/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch43
1 files changed, 18 insertions, 25 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.35/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch b/target/linux/brcm47xx/patches-2.6.35/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
index ab23a366ae..0d241e656b 100644
--- a/target/linux/brcm47xx/patches-2.6.35/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
+++ b/target/linux/brcm47xx/patches-2.6.35/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
@@ -1,27 +1,18 @@
-From a41121d789e236fd637ab49beb5ce7b48763613a 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
-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.
+This patch has been in OpenWRT for a long time.
+
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
- arch/mips/Kconfig | 1 -
- arch/mips/bcm47xx/setup.c | 37 ++++++++++++++++++++++++++++++++++++-
- 2 files changed, 36 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 @@
@@ -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>
-@@ -190,12 +192,45 @@ static int bcm47xx_get_invariants(struct
+@@ -190,12 +192,47 @@ static int bcm47xx_get_invariants(struct
void __init plat_mem_setup(void)
{
@@ -48,16 +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;
+
-+ 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(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));
++ 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++) {