aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-06 23:55:35 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-06 23:55:35 +0000
commitb2018180441b7b51f15bfd74669e21f4a0127f30 (patch)
treea4d918cf53f9800b34472d9d1f710d6cb7c328d4 /target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
parentebf07787210deee29e3ad4f2308433866a853c20 (diff)
downloadupstream-b2018180441b7b51f15bfd74669e21f4a0127f30.tar.gz
upstream-b2018180441b7b51f15bfd74669e21f4a0127f30.tar.bz2
upstream-b2018180441b7b51f15bfd74669e21f4a0127f30.zip
brcm47xx: update early printk patches
Early printk was disabled because it caused hangs on some devices, the old patches were using the CFE console now we use the normal serial console, it is at a constant address. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38309
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch b/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
index 5e8a2cb461..333b9e6c5b 100644
--- a/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
+++ b/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
@@ -1,14 +1,14 @@
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
-@@ -33,6 +33,7 @@
+@@ -31,6 +31,7 @@
+ #include <linux/ssb/ssb.h>
+ #include <linux/ssb/ssb_embedded.h>
#include <linux/bcma/bcma_soc.h>
- #include <linux/serial.h>
- #include <linux/serial_8250.h>
+#include <linux/gpio_wdt.h>
#include <asm/bootinfo.h>
#include <asm/prom.h>
#include <asm/reboot.h>
-@@ -260,6 +261,33 @@ void __init plat_mem_setup(void)
+@@ -229,6 +230,33 @@ void __init plat_mem_setup(void)
mips_set_machine_name(bcm47xx_board_get_name());
}
@@ -42,7 +42,7 @@
static int __init bcm47xx_register_bus_complete(void)
{
switch (bcm47xx_bus_type) {
-@@ -274,6 +302,8 @@ static int __init bcm47xx_register_bus_c
+@@ -243,6 +271,8 @@ static int __init bcm47xx_register_bus_c
break;
#endif
}